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=51addbb09ee9edf707af756c8d9d035807aa99d2;hb=ac816c402bf23a233e2614f537fbfec490294a20;hp=8e3e6bbdc1c926d28270e3900f7d8648a7f01cf3;hpb=11cf079ab699e65f6c97b86745a3c8cbd65817b8;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 8e3e6bbd..51addbb0 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
@@ -33,11 +33,12 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	private PipelineComponent component;
 	
 	private PointType type;
-	private boolean fixed = true;
-	private boolean rotate = false;
-	private boolean reverse = false;
-	private boolean deletable = true;
-	private boolean sub = false;
+	private boolean isFixed = true;
+	private boolean isRotate = false;
+	private boolean isReverse = false;
+	private boolean isDeletable = true;
+	private boolean isSizeChange = false;
+	private boolean isSub = false;
 	
 	public PipeControlPoint(PipelineComponent component) {
 		this.component = component;
@@ -79,43 +80,43 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	
 	@GetPropertyValue(name="Fixed",tabId="Debug",value="fixed")
 	public boolean isFixed() {
-		return fixed;
+		return isFixed;
 	}
 	
 	
 	public void setFixed(boolean fixed) {
-		this.fixed = fixed;
+		this.isFixed = fixed;
 	}
 	
 	@GetPropertyValue(name="Rotate",tabId="Debug",value="rotate")
 	public boolean isRotate() {
-		return rotate;
+		return isRotate;
 	}
 	
 	public void setRotate(boolean rotate) {
-		this.rotate = rotate;
+		this.isRotate = rotate;
 	}
 	
 	@GetPropertyValue(name="Reverse",tabId="Debug",value="reverse")
 	public boolean isReverse() {
-		return reverse;
+		return isReverse;
 	}
 	
 	public void setReverse(boolean reverse) {
-		this.reverse = reverse;
+		this.isReverse = reverse;
 	}
 	
 	public void setSub(boolean sub) {
-		this.sub = sub;
+		this.isSub = sub;
 	}
 		
 	@GetPropertyValue(name="Deletable",tabId="Debug",value="deletable")
 	public boolean isDeletable() {
-		return deletable;
+		return isDeletable;
 	}
 	
 	public void setDeletable(boolean deletable) {
-		this.deletable = deletable;
+		this.isDeletable = deletable;
 	}
 	
 	public boolean isPathLegEnd() {
@@ -135,23 +136,23 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	}
 	
 	public boolean isDirected() {
-		return fixed && isEnd();
+		return isFixed && isEnd();
 	}
 	
 	public boolean isNonDirected() {
-		return !fixed && isEnd();
+		return !isFixed && isEnd();
 	}
 	
 	public boolean isVariableLength() {
-		return !fixed && isInline();
+		return !isFixed && isInline();
 	}
 	
 	public boolean isVariableAngle() {
-		return !fixed && isTurn();
+		return !isFixed && isTurn();
 	}
 	
 	public boolean isBranchEnd() {
-		return deletable && isEnd();
+		return isDeletable && isEnd();
 	}
 	
 	public boolean isOffset() {
@@ -159,7 +160,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	}
 	
 	public boolean isDualSub() {
-		return parent != null && sub;
+		return parent != null && isSub;
 	}
 	
 	public boolean isDualInline() {
@@ -167,12 +168,17 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 	}
 	
 	public boolean isSizeChange() {
-		if (children.size() == 0)
-			return false;
-		if (!isDualInline())
-			return false;
-		return getPipeRun() != children.get(0).getPipeRun();
+	    return isSizeChange;
+//		if (children.size() == 0)
+//			return false;
+//		if (!isDualInline())
+//			return false;
+//		return getPipeRun() != children.get(0).getPipeRun();
 	}
+	
+	public void setSizeChange(boolean isSizeChange) {
+        this.isSizeChange = isSizeChange;
+    }
 
 	
 	private PipeControlPoint next;
@@ -189,12 +195,14 @@ 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 == this)
+            throw new RuntimeException("Cannot connect to self");
 		if (this.next == next)
 		    return;
 		if (DEBUG) System.out.println(this + " next " + next);
 		this.next = next;
 		if (component != null) {
-			if (parent == null || sub)
+			if (parent == null || isSub)
 				component.setNext(next != null ? next.component : null);
 			else
 				component.setBranch0(next != null ? next.component : null);
@@ -206,12 +214,14 @@ 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 == this)
+		    throw new RuntimeException("Cannot connect to self");
 		if (this.previous == previous)
 		    return;
 		if (DEBUG) System.out.println(this + " previous " + previous);
 		this.previous = previous;
 		if (component != null) {
-			if (parent == null || sub)
+			if (parent == null || isSub)
 				component.setPrevious(previous != null ? previous.component : null);
 			else
 				component.setBranch0(previous != null ? previous.component : null);
@@ -404,7 +414,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 				 dir.normalize();
 			 Quat4d q =  getControlPointOrientationQuat(dir, angle);
 			 if (reversed) {
-				 Quat4d q2 = new Quat4d();
+				Quat4d q2 = new Quat4d();
 				q2.set(new AxisAngle4d(MathTools.Y_AXIS, Math.PI));
 				q.mulInverse(q2);
 			 }
@@ -1128,8 +1138,10 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		ocp.removeComponent();
 		sccp.removeComponent();
 		
-		p1.remChild(ocp);
-		p2.remChild(sccp);
+		if (p1 != null)
+		    p1.remChild(ocp);
+		if (p2 != null)
+		    p2.remChild(sccp);
 		
 		// TODO : now we assume that this is size change, and we do
 		if (ocp.next != null)
@@ -1145,8 +1157,10 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		sccp.setNext(null);
 		sccp.setPrevious(null);
 		
-		checkRemove(p1);
-		checkRemove(p2);
+		if (p1 != null)
+		    checkRemove(p1);
+		if (p2 != null)
+		    checkRemove(p2);
 	}
 	
 	private void removeSubPoints() {
@@ -1189,9 +1203,9 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
 		}
 		if (br0 != null) {
 		    if (br0.getNext() == component)
-		        prev.setNext(null);
+		        br0.setNext(null);
 		    else if (br0.getPrevious() == component)
-                prev.setPrevious(null);
+		        br0.setPrevious(null);
 		    else if (br0.getBranch0() == component)
 		        br0.setBranch0(null);
 		}