X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Futils%2FComponentUtils.java;h=ea9f492f6b96e8144215cff483399e6ee7d9af32;hb=1c22d60d859f73fe6320ff1ed1cc6f753752d97a;hp=438e0bd6a96eae87cf8121640a11bfd350409161;hpb=47a78f85f52d380243f8138a8104f79299c3c86c;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
index 438e0bd6..ea9f492f 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
@@ -378,9 +378,6 @@ public class ComponentUtils {
 	public static PipelineComponent addComponent(P3DRootNode root, PipelineComponent component,  InsertInstruction inst) throws Exception {
 		
 		PipelineComponent newComponent = ComponentUtils.createComponent(root, inst.typeUri);
-		if (inst.name != null)
-			newComponent.setName(inst.name);
-		
 		PipeControlPoint newPcp = newComponent.getControlPoint();
 		
 		PipeControlPoint toPcp = component.getControlPoint();
@@ -408,6 +405,8 @@ public class ComponentUtils {
 			sizeChange = ((InlineComponent)newComponent).isSizeChange();
 		}
 		
+		// Calculate component position and direction vectors
+		// 'dir' is a unit vector that represents the direction from 'component' to 'newComponent'
 		if (toPcp.isInline()) {
 			switch (position) {
 			case NEXT: 
@@ -428,15 +427,15 @@ public class ComponentUtils {
 			}
 			Vector3d start = new Vector3d();
 			Vector3d end = new Vector3d();
-			dir = new Vector3d();
-			toPcp.getInlineControlPointEnds(start, end, dir);
-			dir.normalize();
+			dir = toPcp.getInlineDir();
+			toPcp.getControlPointEnds(start, end);
 			switch (position) {
 			case NEXT:
 				pos = new Vector3d(end);
 				break;
 			case PREVIOUS:
 				pos = new Vector3d(start);
+				dir.negate();
 				break;
 			case SPLIT:
 				pos = new Vector3d(toPcp.getWorldPosition());
@@ -444,9 +443,9 @@ public class ComponentUtils {
 			default:
 				break;
 			}
-
 		} else if (toPcp.isDirected()) {
-			dir = new Vector3d(toPcp.getDirection(Direction.NEXT));
+			// 'dir' always points out of a nozzle regardless of insertion direction
+			dir = new Vector3d(toPcp.getDirectedControlPointDirection());
 			pos = new Vector3d(toPcp.getWorldPosition());
 		} else if (toPcp.isTurn() && toPcp.asFixedAngle()) {
 			dir = new Vector3d(toPcp.getDirection(position == PositionType.NEXT ? Direction.NEXT : Direction.PREVIOUS));
@@ -469,8 +468,12 @@ public class ComponentUtils {
 			}
 		}
 		
-		String name = component.getPipeRun().getUniqueName(typeName);
-		newComponent.setName(name);
+		if (inst.name != null) {
+			newComponent.setName(inst.name);
+		} else {
+			String name = component.getPipeRun().getUniqueName(typeName);
+			newComponent.setName(name);
+		}
 
 		pipeRun.addChild(newComponent);
 		if (newPcp.isSizeChange())
@@ -487,14 +490,13 @@ public class ComponentUtils {
 		} else if (newComponent instanceof TurnComponent) {
 		    TurnComponent turnComponent = (TurnComponent)newComponent;
 		    if  (turnComponent.isVariableAngle()) {
-				newPcp.setTurnAngle(inst.angle);
+				newPcp.setTurnAngle(Math.toRadians(inst.angle));
 				newComponent.setParameter("turnAngle", inst.angle);
 		    }
 		    if (inst.rotationAngle != null)
                 ((TurnComponent) newComponent).setRotationAngle(inst.rotationAngle);
 		}
 		
-		
 		newComponent.updateParameters();
 		
 		Vector3d v = new Vector3d(dir);
@@ -513,12 +515,11 @@ public class ComponentUtils {
 		} else {
 			v.scale(newComponent.getControlPoint().getInlineLength());
 		}
+		
 		switch (position) {
 		case NEXT:
-			pos.add(v);
-			break;
 		case PREVIOUS:
-			pos.sub(v);
+			pos.add(v);
 			break;
 		case SPLIT:
 			break;