Support for random shaped terminals

[simantics/platform.git] / bundles / org.simantics.diagram.connection / src / org / simantics / diagram / connection / RouteGraph.java

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 249399d0a8b5b7b6c875c68d8464fda198961160..9b707eae7e51524ec96c298042d9694e369cd4e5 100644 (file)
--- 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
@@ -42,12 +42,12 @@ public class RouteGraph implements Serializable {
     public static final boolean RETURN_UNMODIFIABLE_COLLECTIONS = false;
     public static final boolean CHECK_PARAMERS = true;
 
-    ArrayList<RouteLine> lines = new ArrayList<RouteLine>(4);
-    ArrayList<RouteTerminal> terminals = new ArrayList<RouteTerminal>(4);
-    ArrayList<RouteLine> transientLines = new ArrayList<RouteLine>(4);
-    int caseId;
-    boolean isSimpleConnection;
-    boolean needsUpdate = false;
+    protected ArrayList<RouteLine> lines = new ArrayList<RouteLine>(4);
+    protected ArrayList<RouteTerminal> terminals = new ArrayList<RouteTerminal>(4);
+    protected ArrayList<RouteLine> transientLines = new ArrayList<RouteLine>(4);
+    protected int caseId;
+    protected boolean isSimpleConnection;
+    protected boolean needsUpdate = false;
 
     public void updateTerminals() {
         boolean changed = false;
@@ -270,7 +270,7 @@ public class RouteGraph implements Serializable {
         needsUpdate = true;
     }
     
-    void removeTransientRouteLines() {
+    protected void removeTransientRouteLines() {
         for(RouteLine line : transientLines)
             line.remove();
         transientLines.clear();
@@ -336,6 +336,11 @@ public class RouteGraph implements Serializable {
                 line.addPoint(b);
                 line.terminal = a;
                 transientLines.add(line);
+                
+                // Path terminal
+                a.line = line;
+                b.line = line;
+                
                 break;
             }
             case SimpleConnectionUtility.ONE_BEND_HORIZONTAL_VERTICAL: {
@@ -348,6 +353,10 @@ public class RouteGraph implements Serializable {
                 line2.terminal = b;
                 transientLines.add(line1);
                 transientLines.add(line2);
+               
+                // Path terminal
+                a.line = line1;
+                b.line = line2;
                 break;
             }
             case SimpleConnectionUtility.ONE_BEND_VERTICAL_HORIZONTAL: {
@@ -360,6 +369,10 @@ public class RouteGraph implements Serializable {
                 line2.terminal = b;
                 transientLines.add(line1);
                 transientLines.add(line2);
+                
+                //Path terminal
+                a.line = line1;
+                b.line = line2;
                 break;
             }
             case SimpleConnectionUtility.MORE_BENDS_BBS_DONT_INTERSECT: 
@@ -375,6 +388,7 @@ public class RouteGraph implements Serializable {
                 break;
             }
             }
+            //routeFromTerminals(caseId==SimpleConnectionUtility.MORE_BENDS_BBS_INTERSECT);
         }
         else {
             caseId = SimpleConnectionUtility.COMPLEX_CONNECTION;
@@ -396,7 +410,7 @@ public class RouteGraph implements Serializable {
         }
     }
     
-    static class Interval {
+    public static class Interval {
         public final double min;
         public final double max;
         public Interval(double min, double max) {
@@ -405,7 +419,7 @@ public class RouteGraph implements Serializable {
         }
     }
     
-    class IntervalCache {
+    public class IntervalCache {
         THashMap<RouteLine, Interval> cache = 
                 new THashMap<RouteLine, Interval>();
         public Interval get(RouteLine line) {
@@ -457,7 +471,7 @@ public class RouteGraph implements Serializable {
         }
     } 
     
-    private void routeFromTerminals(boolean boundingBoxesIntersect) {
+    protected void routeFromTerminals(boolean boundingBoxesIntersect) {
         IntervalCache cache = new IntervalCache();
         for(RouteTerminal terminal : terminals) 
             if(terminal.line != null) {