From: Jussi Koskela <jussi.koskela@semantum.fi>
Date: Wed, 11 Mar 2020 13:35:51 +0000 (+0200)
Subject: Don't create degenerated transient RouteLines to RouteGraph
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F3985%2F2;p=simantics%2Fplatform.git

Don't create degenerated transient RouteLines to RouteGraph

This change addresses the trivial cases. If multiple bends are required
we still get degenerated lines if the terminal is at the corner of the
bounds.

gitlab #495

Change-Id: Iac5d139ba805955c38d4b4e4906eda4795871a66
---

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 9b707eae7..b7ee272bb 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
@@ -276,6 +276,12 @@ public class RouteGraph implements Serializable {
         transientLines.clear();
     }
     
+    protected void removeRouteTerminalsFromRouteLines() {
+        for(RouteLine line : lines) {
+            line.removeRouteTerminals();
+        }
+    }
+
     /**
      * Rotates given terminal clockwise by given amount
      * (also negative numbers are allowed). 
@@ -310,6 +316,7 @@ public class RouteGraph implements Serializable {
     public void update() {
         needsUpdate = false;
         removeTransientRouteLines();
+        removeRouteTerminalsFromRouteLines();
 
         //print();
         
diff --git a/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteLine.java b/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteLine.java
index a6a4f22d2..2011bfa28 100644
--- a/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteLine.java
+++ b/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteLine.java
@@ -188,6 +188,10 @@ public class RouteLine implements RouteNode, Serializable {
     	return lines;
     }
 
+    public void removeRouteTerminals() {
+        points.removeIf(p -> p instanceof RouteTerminal);
+    }
+
     public RouteTerminal getTerminal() {
         return terminal;
     }
diff --git a/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteTerminal.java b/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteTerminal.java
index dd660d4aa..3d6bd182f 100644
--- a/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteTerminal.java
+++ b/bundles/org.simantics.diagram.connection/src/org/simantics/diagram/connection/RouteTerminal.java
@@ -164,18 +164,31 @@ public class RouteTerminal extends RoutePoint implements RouteNode, Serializable
             boolean routeLineDoesNotIntersectTerminal;
             double linePosition = line.position;
             if(line.isHorizontal) { 
+                if (linePosition == y) {
+                    // direct route to terminal
+                    line.addPoint(this);
+                    return;
+                }
                 lineDir = linePosition < y ? 3 : 1;
                 routeLineDoesNotIntersectTerminal = linePosition <= minY || linePosition >= maxY 
                         || boundingBoxesIntersect /* we ignore intersection in this case */;
             }
             else {
+                if (linePosition == x) {
+                    // direct route to terminal
+                    line.addPoint(this);
+                    return;
+                }
                 lineDir = linePosition < x ? 2 : 0;
                 routeLineDoesNotIntersectTerminal = linePosition <= minX || linePosition >= maxX
                         || boundingBoxesIntersect /* we ignore intersection in this case */;
             }
                     
             // We can route the connection directly to the right direction
-            if(routeLineDoesNotIntersectTerminal && 
+            if((routeLineDoesNotIntersectTerminal ||
+                    (line.isHorizontal && (x == minX || x == maxX)) || // already on the top/bottom edge
+                    (!line.isHorizontal && (y == minY || y == maxY)) // already on the left/right edge
+                    ) && 
                     Directions.isAllowed(allowedDirections, lineDir)) {           
                 RouteLine line0 = createLine0(lineDir);
                 new RouteLink(line0, line);