X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FInlineComponent.java;h=695f1fa698e040b657655e8ddf67b62b687695d5;hb=refs%2Fchanges%2F85%2F4085%2F1;hp=3ec6b3547c317c5022a5bac7804e4288eef7e096;hpb=34c84195e058b46afe68590eaf751b12bc74c1fe;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 3ec6b354..695f1fa6 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java
@@ -36,6 +36,9 @@ public class InlineComponent extends PipelineComponent {
 	public void setType(String type) throws Exception{
 		this.type = type;
 		controlPoint = ControlPointFactory.create(this);
+		syncNext();
+        syncPrevious();
+        syncBranch0();
 		
 	}
 	
@@ -54,6 +57,10 @@ public class InlineComponent extends PipelineComponent {
 		return !controlPoint.isFixed();
 	}
 	
+	public boolean isModifialble() {
+        return controlPoint.isMod();
+    }
+	
 	public boolean isSizeChange() {
 		return controlPoint.isSizeChange();
 	}
@@ -82,12 +89,8 @@ public class InlineComponent extends PipelineComponent {
 		if (controlPoint.getRotationAngle() != null && Math.abs(controlPoint.getRotationAngle()-angle) < MathTools.NEAR_ZERO)
 			return;
 		controlPoint.setRotationAngle(angle);
-		try {
-			PipingRules.requestUpdate(getControlPoint());
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}	
+		PipingRules.requestUpdate(getControlPoint());
+
 	}
 	
 	@RelatedGetValue(Plant3D.URIs.IsReversed)
@@ -108,28 +111,28 @@ public class InlineComponent extends PipelineComponent {
 			return;
 		}
 		controlPoint.setReversed(reverse);
-		try {
-			PipingRules.requestUpdate(getControlPoint());
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}	
+		PipingRules.requestUpdate(getControlPoint());
 	}
 	
 	@Override
 	public void updateParameters() {
 		super.updateParameters();
 		if (!isVariableLength()) {
-			Map<String,Object> calculated = getTotalParameters();
-			if (calculated.containsKey("length")) {
-				controlPoint.setLength((Double)calculated.get("length"));
-			}
+			Map<String,Object> calculated = getCalculatedParameters();
+			
 			if (calculated.containsKey("offset")) {
 				controlPoint.setOffset((Double)calculated.get("offset"));
 				componentCalculatedOffset = true;
 			} else {
 				componentCalculatedOffset = false;
 			}
+			
+			Map<String,Object> total = getTotalParameters();
+			
+			if (total.containsKey("length")) {
+                controlPoint.setLength((Double)total.get("length"));
+            }
+			
 			PipingRules.requestUpdate(getControlPoint());
 		}
 	}
@@ -154,7 +157,7 @@ public class InlineComponent extends PipelineComponent {
 	
 	private void updateOffset() {
 		if (!componentCalculatedOffset && getControlPoint().isOffset()) {
-			getControlPoint().setOffset(getPipeRun().getPipeDiameter()*0.5 - getAlternativePipeRun().getPipeDiameter()*0.5);
+			getControlPoint().setOffset(getPipeRun().getInsideDiameter()*0.5 - getAlternativePipeRun().getInsideDiameter()*0.5);
 		}
 	}
 
@@ -165,12 +168,13 @@ public class InlineComponent extends PipelineComponent {
 			if (!Double.isNaN(controlPoint.getLength()) && controlPoint.isVariableLength())
 				map.put("length", controlPoint.getLength());
 			if (controlPoint.isDualInline()) {
-				PipeControlPoint sub = controlPoint.getSubPoint().get(0);
+				PipeControlPoint sub = controlPoint.getDualSub();
 				PipeRun pipeRun2 = sub.getPipeRun();
 				if (pipeRun2 != null) {
 					map.put("radius2", pipeRun2.getPipeDiameter() * 0.5);
 				}
 				if (controlPoint.isOffset() && !componentCalculatedOffset) {
+					updateOffset();
 					map.put("offset", controlPoint.getOffset());
 				}
 			}