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=ac76be8b25f373f1e133cb1c2860b52433343548;hb=0602e0f78f22aaf27211ef1de801ddc631e103c0;hp=22c58ddb160be1a1f43303b34e63d1dd3614bc17;hpb=8b06e290cf681e2157824428395988063686e7b3;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 22c58ddb..ac76be8b 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
@@ -7,6 +7,7 @@ import java.util.List;
 
 import javax.vecmath.AxisAngle4d;
 import javax.vecmath.Matrix3d;
+import javax.vecmath.Point3d;
 import javax.vecmath.Quat4d;
 import javax.vecmath.Tuple3d;
 import javax.vecmath.Vector3d;
@@ -22,6 +23,8 @@ import vtk.vtkRenderer;
 
 
 public class PipeControlPoint extends G3DNode implements IP3DNode {
+    
+    private static boolean DEBUG = false;
 	
 	public enum Type{INLINE,TURN,END};
 	public enum Direction{NEXT,PREVIOUS};
@@ -186,8 +189,9 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	public void setNext(PipeControlPoint next) {
 		if (isEnd() && previous != null && next != null)
 			throw new RuntimeException("End control points are allowed to have only one connection");
-//		if (next != null && getPipeRun() == null)
-//			throw new RuntimeException("Cannot connect control point befor piperun has been set");
+		if (this.next == next)
+		    return;
+		if (DEBUG) System.out.println(this + " next " + next);
 		this.next = next;
 		if (component != null) {
 			if (parent == null || sub)
@@ -202,8 +206,9 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	public void setPrevious(PipeControlPoint previous) {
 		if (isEnd() && next != null && previous != null)
 			throw new RuntimeException("End control points are allowed to have only one connection");
-//		if (previous != null && getPipeRun() == null)
-//			throw new RuntimeException("Cannot connect control point befor piperun has been set");
+		if (this.previous == previous)
+		    return;
+		if (DEBUG) System.out.println(this + " previous " + previous);
 		this.previous = previous;
 		if (component != null) {
 			if (parent == null || sub)
@@ -225,14 +230,8 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	public PipeControlPoint getParentPoint() {
 		return parent;
 	}
-	
-	
-	
 
 	
-	
-	
-	
 	private double length;
 	private Double turnAngle;
 	private Vector3d turnAxis;
@@ -300,7 +299,9 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	}
 	
 	public void setTurnAxis(Vector3d turnAxis) {
-		this.turnAxis = turnAxis;
+	    if (this.turnAxis != null && MathTools.equals(turnAxis, this.turnAxis))
+            return;
+	    this.turnAxis = turnAxis;
 		firePropertyChanged("turnAxis");
 	}
 	
@@ -483,6 +484,8 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                     dir.sub(pcp.getWorldPosition(),previous.getWorldPosition());
                     if (dir.lengthSquared() > MathTools.NEAR_ZERO)
                          dir.normalize();
+                    else
+                        return null;
                     Quat4d q = getControlPointOrientationQuat(dir, pcp.getRotationAngle() != null ? pcp.getRotationAngle() : 0.0);
                     AxisAngle4d aa = new AxisAngle4d(MathTools.Y_AXIS,pcp.getTurnAngle() == null ? 0.0 : pcp.getTurnAngle());
                     Quat4d q2 = MathTools.getQuat(aa);
@@ -499,6 +502,8 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
                     dir.sub(next.getWorldPosition(),pcp.getWorldPosition());
                     if (dir.lengthSquared() > MathTools.NEAR_ZERO)
                          dir.normalize();
+                    else
+                        return null;
                     Quat4d q = getControlPointOrientationQuat(dir, pcp.getRotationAngle() != null ? pcp.getRotationAngle() : 0.0);
                     AxisAngle4d aa = new AxisAngle4d(MathTools.Y_AXIS,pcp.getTurnAngle() == null ? 0.0 : pcp.getTurnAngle());
                     Quat4d q2 = MathTools.getQuat(aa);
@@ -1009,7 +1014,19 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 					if (currentNext.isVariableLength() && currentPrev.isVariableLength()) {
 						// we have to join them into single variable length component.
 						additionalRemove = currentPrev;
-						//currentPrev.remove();
+						// combine lengths and set the location of remaining control point to the center.
+						Point3d ps = new Point3d();
+					    Point3d pe = new Point3d();
+					    Point3d ns = new Point3d();
+                        Point3d ne = new Point3d();
+						currentPrev.getInlineControlPointEnds(ps, pe);
+						currentNext.getInlineControlPointEnds(ns, ne);
+						double l = currentPrev.getLength() + currentNext.getLength();
+						Vector3d cp = new Vector3d();
+						cp.add(ps, ne);
+						cp.scale(0.5);
+						currentNext.setLength(l);
+						currentNext.setWorldPosition(cp);
 					}
 				} else {
 					// FIXME : pipe run must be split into two parts, since the control point structure is no more continuous. 
@@ -1149,18 +1166,34 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		if (component == null)
 			return;
 		PipelineComponent next = component.getNext();
-		PipelineComponent prev = component.getNext();
+		PipelineComponent prev = component.getPrevious();
+		PipelineComponent br0 = component.getBranch0();
+		component.setNext(null);
+		component.setPrevious(null);
+		component.setBranch0(null);
 		if (next != null) {
 			if (next.getNext() == component)
 				next.setNext(null);
 			else if (next.getPrevious() == component)
 				next.setPrevious(null);
+			else if (next.getBranch0() == component)
+			    next.setBranch0(null);
 		}
 		if (prev != null) {
 			if (prev.getNext() == component)
 				prev.setNext(null);
 			else if (prev.getPrevious() == component)
 				prev.setPrevious(null);
+			else if (prev.getBranch0() == component)
+			    prev.setBranch0(null);
+		}
+		if (br0 != null) {
+		    if (br0.getNext() == component)
+		        prev.setNext(null);
+		    else if (br0.getPrevious() == component)
+                prev.setPrevious(null);
+		    else if (br0.getBranch0() == component)
+		        br0.setBranch0(null);
 		}
 		PipelineComponent comp = component;
 		component = null;