X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2Fcontrolpoint%2FPipeControlPoint.java;h=c5d780c36b8d5f2dc3b4d0abf5642410509614f3;hb=f14dcbc36aa8931a68795716d5ebcb3808d6bce5;hp=eae8ec33220aacc91b27873cf86e9eef4d7110a9;hpb=b35befd422dd71c2358bcc3b198f38d52ac0b966;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
index eae8ec33..c5d780c3 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
@@ -43,6 +43,8 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	private boolean isSizeChange = false;  // changes size of the pipe. The next control point / component is on different PipeRun
 	private boolean isSub = false;         // child point for offset / size change
 
+	private boolean disposed = false;
+	
 	public PipeControlPoint(PipelineComponent component) {
 		this.component = component;
 		if (component.getPipeRun() != null)
@@ -145,6 +147,11 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	public boolean isInline() {
 		return type == PointType.INLINE;
 	}
+	
+	public boolean asPathLegEnd() {
+	    // Ends and Turns are path leg ends by default, but also unconnected inline are path leg ends.
+	    return isPathLegEnd() || getNext() == null || getPrevious() == null;
+	}
 
 	/**
 	 * True for end components, if control point defines absolute position direction, which rules cannot modify. 
@@ -341,6 +348,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
         if (MathTools.createRotation(dirOutN, dirOut, dir, aa)) {
             setRotationAngle(aa.angle);
             setTurnAngle(angle);
+            if (DEBUG) System.out.println("convertToFixed " + dir + " " + dirOut + " " +dirOutN + " " +angle + " "+ aa.angle);
         }
 	}
 
@@ -521,26 +529,34 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 			return getControlPointOrientationQuat(dir, turnAxis, angle);
 		}
 	}
+	
+	public Quat4d getControlPointOrientationQuat(Vector3d dir, double angle, boolean reversed) {
+	    if (turnAxis == null) {
+            if (dir.lengthSquared() > MathTools.NEAR_ZERO)
+                dir.normalize();
+            Quat4d q =  getControlPointOrientationQuat(dir, angle);
+            if (reversed) {
+                Quat4d q2 = new Quat4d();
+                q2.set(new AxisAngle4d(MathTools.Y_AXIS, Math.PI));
+                q.mulInverse(q2);
+            }
+            return q;
+        } else {
+            if (dir.lengthSquared() > MathTools.NEAR_ZERO)
+                dir.normalize();
+            return getControlPointOrientationQuat(dir, turnAxis, angle);
+        }
+	}
 
 	public Quat4d getControlPointOrientationQuat(double angle, boolean reversed) {
 
 		if (turnAxis == null) {
 			Vector3d dir = getPathLegDirection(Direction.NEXT);
-			if (dir.lengthSquared() > MathTools.NEAR_ZERO)
-				dir.normalize();
-			Quat4d q =  getControlPointOrientationQuat(dir, angle);
-			if (reversed) {
-				Quat4d q2 = new Quat4d();
-				q2.set(new AxisAngle4d(MathTools.Y_AXIS, Math.PI));
-				q.mulInverse(q2);
-			}
-			return q;
+			return getControlPointOrientationQuat(dir, angle, reversed);
 		} else {
 			Vector3d dir = getPathLegDirection(Direction.PREVIOUS);
 			dir.negate();
-			if (dir.lengthSquared() > MathTools.NEAR_ZERO)
-				dir.normalize();
-			return getControlPointOrientationQuat(dir, turnAxis, angle);
+			return getControlPointOrientationQuat(dir, angle, reversed);
 		}
 	}
 
@@ -1065,17 +1081,19 @@ 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 (disposed)
+	        return;
+		
+	    if (DEBUG) System.out.println(this + " Remove " + renconnect);
 
 		if (getParentPoint() != null) {
 		    getParentPoint()._remove(renconnect);
 		    return;
 		}
 		PipeRun pipeRun = getPipeRun();
-		if (pipeRun == null)
-			return;
+//		PipeRUn removal has been changed, so pipeRun may be null.
+//		if (pipeRun == null)
+//			return;
 
 		PipeControlPoint additionalRemove = null;
 		if (!PipingRules.isEnabled()) {
@@ -1088,8 +1106,10 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 			PipeControlPoint currentNext = next;
 			if (currentNext == null && currentPrev == null) {
 				removeComponent();
-				pipeRun.remChild(this);
-				checkRemove(pipeRun);
+				if (pipeRun != null) {
+				    pipeRun.remChild(this);
+				    checkRemove(pipeRun);
+				}
 				return;
 			}
 			if (currentNext != null && currentPrev != null) {
@@ -1208,7 +1228,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 			} else if (currentNext != null) {
 				if (currentNext.isDualInline()) {
 					PipeControlPoint sccp = currentNext;
-					PipeControlPoint ocp = getDualSub();
+					PipeControlPoint ocp = currentNext.getDualSub();
 					if (ocp == null) {
 						throw new RuntimeException("Removing PipeControlPoint " + this+ " structure damaged, no offset control point");
 					}
@@ -1255,12 +1275,15 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		}
 
 		removeComponent();
-		pipeRun.remChild(this);
-		checkRemove(pipeRun);
-		if (PipingRules.isEnabled() && pipeRun.getParent() != null && pipeRun.getControlPoints().size() > 0)
-			PipingRules.validate(pipeRun);
+		if (pipeRun != null) {
+    		pipeRun.remChild(this);
+    		checkRemove(pipeRun);
+    		if (PipingRules.isEnabled() && pipeRun.getParent() != null && pipeRun.getControlPoints().size() > 0)
+    			PipingRules.validate(pipeRun);
+		}
 		if (additionalRemove != null)
 			additionalRemove.remove();
+		disposed = true;
 	}
 
 	/**
@@ -1305,6 +1328,8 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
             
             PipelineComponent n = next.getPipelineComponent();
             while (n != null) {
+                if (n.getPipeRun() != previousRun)
+                    break;
                 if (! (n instanceof Nozzle)) {
                     n.deattach();
                     nextPipeRun.addChild(n);
@@ -1351,6 +1376,8 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
     }
 
 	private boolean checkRemove(PipeRun pipeRun) {
+	    if (pipeRun == null)
+	        return false;
 		Collection<PipeControlPoint> points = pipeRun.getControlPoints();
 		if (points.size() == 0) {
 			pipeRun.remove();