]> gerrit.simantics Code Review - simantics/3d.git/blobdiff - org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
Use generics type variable for mapping db object.
[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / scenegraph / controlpoint / PipeControlPoint.java
index daab2d111b234d2da42a16f78671a543a9f23607..6c932ad853fac389f56c2a444264151afb76705e 100644 (file)
@@ -683,12 +683,12 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                        } else {
                                if (previous == null) {
                                        if (!isDirected())
-                                               throw new RuntimeException("Cannot calculate path leg direction for unconnected control point");
+                                               throw new RuntimeException("Cannot calculate path leg direction for unconnected control point " + this);
                                        return getDirectedControlPointDirection();
 
                                } else {
                                        if (isVariableAngle())
-                                               throw new RuntimeException("Cannot calculate path leg direction for unconnected variable angle control point");
+                                               throw new RuntimeException("Cannot calculate path leg direction for unconnected variable angle control point " + this);
                                        if (isInline()) {
                                                PipeControlPoint pcp = this;
                                                if (pcp.isDualSub()) {
@@ -706,7 +706,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                                        } else if (isTurn() && isFixed() && !_getReversed()) {
                                                return getDirection(Direction.NEXT);
                                        }
-                                       throw new RuntimeException("Missing implementation");
+                                       throw new RuntimeException("Missing implementation " + this);
                                }
                        }
                } else {
@@ -720,13 +720,13 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                        } else {
                                if (next == null)  {
                                        if (!isDirected())
-                                               throw new RuntimeException("Cannot calculate path leg direction for unconnected control point");
+                                               throw new RuntimeException("Cannot calculate path leg direction for unconnected control point " + this);
                                        Vector3d v = getDirectedControlPointDirection();
                                        v.negate();
                                        return v;
                                } else {
                                        if (isVariableAngle())
-                                               throw new RuntimeException("Cannot calculate path leg direction for unconnected variable angle control point");
+                                               throw new RuntimeException("Cannot calculate path leg direction for unconnected variable angle control point " + this);
                                        if (isInline()) {
                                                PipeControlPoint pcp = this;
                                                if (pcp.isDualInline()) {
@@ -746,7 +746,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                                        } else if (isTurn() && isFixed() && _getReversed()) {
                                                return getDirection(Direction.PREVIOUS);
                                        }
-                                       throw new RuntimeException("Missing implementation");
+                                       throw new RuntimeException("Missing implementation " + this);
                                }
                        }
                }
@@ -768,7 +768,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
        }
 
        public void getControlPointEnds(Tuple3d p1, Tuple3d p2) {
-               PipeControlPoint sub = isAxial() ? this : getSubPoint().get(0);
+               PipeControlPoint sub = isAxial() || isDirected() || isTurn() ? this : getSubPoint().get(0);
                Vector3d pos = getWorldPosition(), pos2 = sub == this ? pos : sub.getWorldPosition();
                
                Vector3d dir1 = getPathLegDirection(Direction.PREVIOUS);
@@ -948,10 +948,14 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
        public void _remove(boolean renconnect) {
                if (component == null && next == null && previous == null)
                        return;
+               if (DEBUG) System.out.println(this + " Remove " + renconnect);
                if (isDualInline() || isDualSub()) {
                        removeDualPoint();
                        return;
                }
+               if (getParentPoint() != null) {
+                   getParentPoint()._remove(renconnect);
+               }
                PipeRun pipeRun = getPipeRun();
                if (pipeRun == null)
                        return;
@@ -1118,20 +1122,32 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                        additionalRemove.remove();
        }
 
+       /**
+        * Removes control point and attempts to reconnect next/prev
+        * 
+        * If this point is size change (PipeRuns are different on both sides), then reconnection cannot be made.
+        */
        public void remove() {
                PipeControlPoint currentPrev = previous;
                PipeControlPoint currentNext = next;
                _remove();
                try {
                        if (currentNext != null)
-                               PipingRules.requestUpdate(currentNext);
+                           if (!currentNext.checkRemove())
+                               PipingRules.requestUpdate(currentNext);
                        if (currentPrev != null)
-                               PipingRules.requestUpdate(currentPrev);
+                           if (!currentPrev.checkRemove())
+                               PipingRules.requestUpdate(currentPrev);
                } catch (Exception e) {
                        e.printStackTrace();
                }
        }
        
+       
+       /**
+        * Removes control point without attempting to reconnect next/prev.
+        * This usually leads to creation of another PipeRun for the control points after this point. 
+        */
        public void removeAndSplit() {
         PipeControlPoint currentPrev = previous;
         PipeControlPoint currentNext = next;
@@ -1159,13 +1175,39 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
         _remove(false);
         try {
             if (currentNext != null)
-                PipingRules.requestUpdate(currentNext);
+                if (!currentNext.checkRemove())
+                    PipingRules.requestUpdate(currentNext);
             if (currentPrev != null)
-                PipingRules.requestUpdate(currentPrev);
+                if (!currentPrev.checkRemove())
+                    PipingRules.requestUpdate(currentPrev);
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
+       
+       /**
+        * This is called when adjacent control point is removed.
+        * 
+        * This call should remove the give point, if the point cannot exist alone. 
+        * At the moment there is one such case: branch.
+        * 
+        * @return
+        */
+       protected boolean checkRemove() {
+           if (getParentPoint() != null) {
+               return getParentPoint().checkRemove();
+           } else {
+               if (getPipelineComponent() == null)
+                   return true; // already removed
+           if (getPipelineComponent().getType().equals("Plant3D.URIs.Builtin_BranchSplitComponent")) {
+               if (getSubPoint().get(0).getNext() == null && getSubPoint().get(0).getPrevious() == null) {
+                       remove();
+                       return true;
+               }
+           }
+            return false;
+           }
+    }
 
        private void checkRemove(PipeRun pipeRun) {
                Collection<PipeControlPoint> points = pipeRun.getControlPoints();