X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.diagram.connection%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Fconnection%2FRouteGraph.java;h=249399d0a8b5b7b6c875c68d8464fda198961160;hp=feaefeb69d15a251e46f8b2a7eb31dfd4460206b;hb=b000e272429e157638c0384878b07b8dcd758472;hpb=c8cce62f9952ab3f6db451d2f22d969b4e777eaa diff --git a/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteGraph.java b/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteGraph.java index feaefeb69..249399d0a 100644 --- a/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteGraph.java +++ b/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteGraph.java @@ -11,26 +11,30 @@ *******************************************************************************/ package org.simantics.diagram.connection; -import gnu.trove.list.array.TDoubleArrayList; -import gnu.trove.map.hash.THashMap; -import gnu.trove.map.hash.TObjectIntHashMap; -import gnu.trove.set.hash.THashSet; - import java.awt.geom.Line2D; import java.awt.geom.Path2D; +import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.io.PrintStream; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; +import java.util.Map; +import java.util.TreeMap; import org.simantics.diagram.connection.rendering.arrows.ILineEndStyle; import org.simantics.diagram.connection.rendering.arrows.PlainLineEndStyle; import org.simantics.diagram.connection.segments.Segment; import org.simantics.diagram.connection.splitting.SplittedRouteGraph; +import gnu.trove.list.array.TDoubleArrayList; +import gnu.trove.map.hash.THashMap; +import gnu.trove.map.hash.TObjectIntHashMap; +import gnu.trove.set.hash.THashSet; + public class RouteGraph implements Serializable { private static final long serialVersionUID = 2004022454972623908L; @@ -129,7 +133,7 @@ public class RouteGraph implements Serializable { double minX, double minY, double maxX, double maxY, ILineEndStyle style) { - return addBigTerminal(minX, minY, maxX, maxY, style, null); + return addBigTerminal(minX, minY, maxX, maxY, style, null); } public RouteTerminal addBigTerminal( double minX, double minY, @@ -509,9 +513,9 @@ public class RouteGraph implements Serializable { for(RouteTerminal terminal : terminals) if((terminal.getAllowedDirections()&0x10) != 0) { try { - RouteLine line = terminal.getLine(); - if(line == null) - continue; + RouteLine line = terminal.getLine(); + if(line == null) + continue; RoutePoint b = line.getBegin(); double distSq = Line2D.ptSegDistSq(terminal.x, terminal.y, b.x, b.y, x, y); if(distSq <= toleranceSq) { @@ -642,7 +646,7 @@ public class RouteGraph implements Serializable { if((mask & PICK_POINTS) != 0) { Object point = pickPoint(x, y, tolerance, mask); if(point != null) - return point; + return point; } /*if((mask & PICK_DIRECT_LINES) != 0) { RouteTerminal terminal = pickDirectLine(x, y, tolerance); @@ -917,12 +921,12 @@ public class RouteGraph implements Serializable { * * Update 14.2.2014: With Sulca, there is a constant issue when line.terminal == null but point is RouteTerminal. */ - if (point instanceof RouteLink) { - RouteLine l = ((RouteLink)point).getOther(line); - l.points.remove(point); - if(!l.isTransient()) - nLines.add(l); - } + if (point instanceof RouteLink) { + RouteLine l = ((RouteLink)point).getOther(line); + l.points.remove(point); + if(!l.isTransient()) + nLines.add(l); + } } if(nLines.isEmpty()) @@ -936,10 +940,10 @@ public class RouteGraph implements Serializable { * * Update 16.10.2014: With Sulca, there is a constant issue when line.terminal == null but point is RouteTerminal. */ - if (point instanceof RouteLink) { - RouteLink link = (RouteLink)point; - link.replace(l, merged); - } + if (point instanceof RouteLink) { + RouteLink link = (RouteLink)point; + link.replace(l, merged); + } } } THashSet removedLines = new THashSet(); @@ -1345,6 +1349,18 @@ public class RouteGraph implements Serializable { path.moveTo(x, y); } + private static final Comparator RG_COMP = (o1, o2) -> { + if (o1.getX() < o2.getX()) + return -1; + else if (o1.getX() > o2.getX()) + return 1; + if (o1.getY() < o2.getY()) + return -1; + else if (o1.getY() > o2.getY()) + return 1; + return 0; + }; + private static void addPathEnd(Path2D path, RoutePoint cur, RouteLine line) { double x = cur.x, y = cur.y; if(cur instanceof RouteTerminal) { @@ -1382,8 +1398,9 @@ public class RouteGraph implements Serializable { } // Analyze graph - THashMap begins = - new THashMap(); + Map begins = +// new THashMap(); //The ordering of the coordinates in the path should be deterministic between scenegraphs + new TreeMap(RG_COMP); for(RouteLine line : lines) { add(begins, line); } @@ -1403,7 +1420,7 @@ public class RouteGraph implements Serializable { } } - private void drawContinuousPath(Path2D path, THashMap begins, + private void drawContinuousPath(Path2D path, Map begins, RoutePoint cur, RouteLine curLine) { if(curLine == null) return; @@ -1432,7 +1449,7 @@ public class RouteGraph implements Serializable { } } - private static void add(THashMap begins, + private static void add(Map begins, RouteLine line) { if(line.points.size() > 1) { { @@ -1458,6 +1475,46 @@ public class RouteGraph implements Serializable { routeLine.collectSegments(segments); return segments; } + + public Segment findNearestSegment(double x, double y) { + Segment nearest = null; + double minDistanceSq = Double.MAX_VALUE; + + for (Segment segment : getSegments()) { + RoutePoint p1 = segment.p1; + RoutePoint p2 = segment.p2; + + double distanceSq = Line2D.ptSegDistSq(p1.x, p1.y, p2.x, p2.y, x, y); + if (distanceSq < minDistanceSq) { + minDistanceSq = distanceSq; + nearest = segment; + } + } + return nearest; + } + + public Point2D findNearestPoint(double x, double y) { + Segment nearest = findNearestSegment(x, y); + if (nearest == null) return null; + + RoutePoint p1 = nearest.p1; + RoutePoint p2 = nearest.p2; + + double d = Math.pow(p2.x - p1.x, 2.0) + Math.pow(p2.y - p1.y, 2.0); + + if (d == 0) { + return new Point2D.Double(p1.x, p1.y); + } else { + double u = ((x - p1.x) * (p2.x - p1.x) + (y - p1.y) * (p2.y - p1.y)) / d; + if (u > 1.0) { + return new Point2D.Double(p2.x, p2.y); + } else if (u <= 0.0) { + return new Point2D.Double(p1.x, p1.y); + } else { + return new Point2D.Double(p2.x * u + p1.x * (1.0-u), (p2.y * u + p1.y * (1.0- u))); + } + } + } public Path2D getPath2D() { Path2D result = new Path2D.Double(); @@ -1558,8 +1615,8 @@ public class RouteGraph implements Serializable { } public void reclaimTransientMemory() { - removeTransientRouteLines(); - needsUpdate = true; + removeTransientRouteLines(); + needsUpdate = true; } }