X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FInlineComponent.java;h=a1558c8642f4f527abc13cda702c8484db441aa1;hb=9e1e51825bfdcd72d7006e1bff703e7eb52919c6;hp=88b1fab3a29a6f8d5214d30fe4b46533914d1a64;hpb=22bb24d2a7e26c70b0dd4c57080f2c25ac3d40a8;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java
index 88b1fab3..a1558c86 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java
@@ -16,6 +16,7 @@ public class InlineComponent extends PipelineComponent {
 
 	private String type;
 	private PipeControlPoint controlPoint;
+	private boolean componentCalculatedOffset = false;
 	
 	@GetType(Plant3D.URIs.InlineComponent)
 	public String getType() {
@@ -52,9 +53,39 @@ public class InlineComponent extends PipelineComponent {
 			if (calculated.containsKey("length")) {
 				controlPoint.setLength((Double)calculated.get("length"));
 			}
+			if (calculated.containsKey("offset")) {
+				controlPoint.setOffset((Double)calculated.get("offset"));
+				componentCalculatedOffset = true;
+			} else {
+				componentCalculatedOffset = false;
+			}
 		}
 	}
 	
+	@Override
+	public void setPipeRun(PipeRun pipeRun) {
+		// TODO Auto-generated method stub
+		super.setPipeRun(pipeRun);
+		if (getPipeRun() != null && getAlternativePipeRun() != null) {
+			updateOffset();
+		}
+	}
+	
+	@Override
+	public void setAlternativePipeRun(PipeRun pipeRun) {
+		// TODO Auto-generated method stub
+		super.setAlternativePipeRun(pipeRun);
+		if (getPipeRun() != null && getAlternativePipeRun() != null) {
+			updateOffset();
+		}
+	}
+	
+	private void updateOffset() {
+		if (!componentCalculatedOffset && getControlPoint().isOffset()) {
+			getControlPoint().setOffset(getPipeRun().getPipeDiameter()*0.5 - getAlternativePipeRun().getPipeDiameter()*0.5);
+		}
+	}
+
 	@Override
 	public Map<String, Object> updateParameterMap() {
 		Map<String,Object> map = new HashMap<String, Object>();
@@ -63,9 +94,12 @@ public class InlineComponent extends PipelineComponent {
 				map.put("length", controlPoint.getLength());
 			if (controlPoint.isDualInline()) {
 				PipeControlPoint sub = controlPoint.getSubPoint().get(0);
-				PipeRun pipeRun = sub.getPipeRun();
-				if (pipeRun != null) {
-					map.put("radius2", pipeRun.getPipeDiameter() * 0.5);
+				PipeRun pipeRun2 = sub.getPipeRun();
+				if (pipeRun2 != null) {
+					map.put("radius2", pipeRun2.getPipeDiameter() * 0.5);
+				}
+				if (controlPoint.isOffset() && !componentCalculatedOffset) {
+					map.put("offset", controlPoint.getOffset());
 				}
 			}
 		}