X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Futils%2FComponentUtils.java;h=78f4166547b8740367cc3c18eaccb5523d0a3148;hb=c6e13a2972fe12620f00f06a97d8746780cb22b1;hp=a1ac7f82834a5a36551e93bebd42b7aa8e9fa45c;hpb=1180e4e22c5935827272cdea27a1abb39c056ca2;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 a1ac7f82..78f41665 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();
@@ -471,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())
@@ -489,7 +490,7 @@ 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)