X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FInlineComponent.java;h=d3e8742c9db93019bc3fe8d087d146a8fa5c2bb8;hb=1ca09aa9bae3ea1e3382ceff0a2a09427f173286;hp=f01e6c585b36cd96ab75a5ff58baf43adc7d55da;hpb=53d55c24c779745f188bdb18d32f71d20acb61b2;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 f01e6c58..d3e8742c 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/InlineComponent.java
@@ -3,6 +3,9 @@ package org.simantics.plant3d.scenegraph;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.vecmath.Point3d;
+import javax.vecmath.Vector3d;
+
 import org.simantics.g3d.math.MathTools;
 import org.simantics.g3d.property.annotations.GetPropertyValue;
 import org.simantics.g3d.property.annotations.SetPropertyValue;
@@ -65,6 +68,7 @@ public class InlineComponent extends PipelineComponent {
 			return 0.0;
 		return MathTools.radToDeg(d);
 	}
+	
 	@RelatedSetValue(Plant3D.URIs.HasRotationAngle)
 	@SetPropertyValue(value=Plant3D.URIs.HasRotationAngle)
 	public void setRotationAngle(Double angle) {
@@ -117,15 +121,21 @@ public class InlineComponent extends PipelineComponent {
 		super.updateParameters();
 		if (!isVariableLength()) {
 			Map<String,Object> calculated = getCalculatedParameters();
-			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;
 			}
+			
+			Map<String,Object> total = getTotalParameters();
+			
+			if (total.containsKey("length")) {
+                controlPoint.setLength((Double)total.get("length"));
+            }
+			
+			PipingRules.requestUpdate(getControlPoint());
 		}
 	}
 	
@@ -157,10 +167,10 @@ public class InlineComponent extends PipelineComponent {
 	public Map<String, Object> updateParameterMap() {
 		Map<String,Object> map = new HashMap<String, Object>();
 		if (controlPoint != null) {
-			if (!Double.isNaN(controlPoint.getLength()))
+			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);
@@ -178,5 +188,21 @@ public class InlineComponent extends PipelineComponent {
 		return map;
 	}
 	
-	
+	@SetPropertyValue("flowlength")
+	public void setFlowLength(double l) {
+		// Not allowed, if not at the end of a run
+		if (getNext() != null)
+			throw new IllegalStateException("Cannot edit length of a connected component");
+		
+		double length = getFlowLength();
+		Point3d p1 = new Point3d(), p2 = new Point3d();
+		controlPoint.getControlPointEnds(p1, p2);
+		Vector3d dir = new Vector3d();
+		dir.sub(p2, p1);
+		dir.normalize();
+		dir.scale((l - length)/2);
+		Vector3d pos = new Vector3d(getPosition());
+		pos.add(dir);
+		setPosition(pos);
+	}
 }