X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Futils%2FComponentUtils.java;h=0ae36e33a2f51ca7a3aa549c14244f4547c873c9;hb=15e688c6d6148fdbda457e5f55bdea4259c97aa8;hp=4e3571444ae3bf759436fe01054330cf586b197b;hpb=ebfe6b0245b5cf9231cecedf0aaacd891eb5d344;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 4e357144..0ae36e33 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
@@ -180,6 +180,25 @@ public class ComponentUtils {
 		return equipment;
 	}
 	
+	public static Equipment createEquipmentWithNozzles(P3DRootNode root, String typeURI, String nozzleTypeUri) throws Exception {
+        GeometryProvider provider = providers.get(typeURI);
+        if (provider == null) {
+            load(typeURI);
+            provider = providers.get(typeURI);
+        }
+        Equipment equipment = root.createEquipment();
+        equipment.setType(typeURI);
+        equipment.setGeometry(provider);
+        root.addChild(equipment);
+        
+        for (int i = 0; i < equipment.numberOfFixedNozzles(); i++) {
+            createNozzle(root, equipment, new Item(nozzleTypeUri, "Nozzle"));
+            
+        }
+        
+        return equipment;
+    }
+	
 	public static InlineComponent createStraight(P3DRootNode root) throws Exception{
 		InlineComponent component = root.createInline();
 		component.setType(Plant3D.URIs.Builtin_Straight);
@@ -214,7 +233,12 @@ public class ComponentUtils {
 		return equipment;
 	}
 	
-	
+	public static Equipment createEquipmentWithNozzles(P3DRootNode root, Item equipmentType, Item nozzleType) throws Exception {
+        Equipment equipment = createEquipmentWithNozzles(root, equipmentType.getUri(), nozzleType.getUri());
+        String n = root.getUniqueName(equipmentType.getName());
+        equipment.setName(n);
+        return equipment;
+    }
 	
 	public static Nozzle createDefaultNozzle(P3DRootNode root, Equipment equipment) throws Exception {
 		return createNozzle(root, equipment, new Item(Plant3D.URIs.Builtin_Nozzle, "Nozzle"));
@@ -251,6 +275,9 @@ public class ComponentUtils {
 		
 		// Variable angle
 		public Double angle;
+		
+		// Rotation angle used with turns and rotated inline.
+		public Double rotationAngle;
 
 		public String getTypeUri() {
 			return typeUri;
@@ -307,6 +334,14 @@ public class ComponentUtils {
 		public void setAngle(Double angle) {
 			this.angle = angle;
 		}
+		
+		public Double getRotationAngle() {
+            return rotationAngle;
+        }
+		
+		public void setRotationAngle(Double rotationAngle) {
+            this.rotationAngle = rotationAngle;
+        }
 
 	}
 	
@@ -329,7 +364,7 @@ public class ComponentUtils {
 		PositionType insertPosition = inst.insertPosition;
 		boolean lengthAdjustable = false;
 		if (newComponent instanceof InlineComponent) {
-			lengthAdjustable = ((InlineComponent)newComponent).isVariableLength(); 
+			lengthAdjustable = ((InlineComponent)newComponent).isVariableLength() || ((InlineComponent)newComponent).isModifialble(); 
 		}
 		boolean insertAdjustable = false;
 		if (component instanceof InlineComponent) {
@@ -344,7 +379,7 @@ public class ComponentUtils {
 			switch (position) {
 			case NEXT: 
 				if (toPcp.isDualInline()) {
-					toPcp = toPcp.getSubPoint().get(0);
+					toPcp = toPcp.getDualSub();
 					pipeRun = toPcp.getPipeRun();
 				}
 				
@@ -407,13 +442,26 @@ public class ComponentUtils {
 			newComponent.setName(name);
 
 			pipeRun.addChild(newComponent);
-			// TODO: these options are not stored into DB. Should they?!
-			if (newComponent instanceof InlineComponent && ((InlineComponent)newComponent).isVariableLength()) {
-				newPcp.setLength(inst.length);
-			} else if (newComponent instanceof TurnComponent && ((TurnComponent)newComponent).isVariableAngle()) {
-				newPcp.setTurnAngle(inst.angle);
+
+			if (newComponent instanceof InlineComponent) {
+			    InlineComponent inlineComponent = (InlineComponent)newComponent;
+			    if (inlineComponent.isVariableLength()|| inlineComponent.isModifialble()) {
+			        newPcp.setLength(inst.length);
+			        newComponent.setParameter("length", inst.length);
+			    }
+			    if (inst.rotationAngle != null)
+			        ((InlineComponent) newComponent).setRotationAngle(inst.rotationAngle);
+			} else if (newComponent instanceof TurnComponent) {
+			    TurnComponent turnComponent = (TurnComponent)newComponent;
+			    if  (turnComponent.isVariableAngle()) {
+    				newPcp.setTurnAngle(inst.angle);
+    				newComponent.setParameter("turnAngle", inst.angle);
+			    }
+			    if (inst.rotationAngle != null)
+	                ((TurnComponent) newComponent).setRotationAngle(inst.rotationAngle);
 			}
 			
+			
 			newComponent.updateParameters();
 			
 			Vector3d v = new Vector3d(dir);
@@ -443,7 +491,7 @@ public class ComponentUtils {
 			switch (position) {
 			case NEXT: 
 				if (toPcp.isDualInline())
-					toPcp = toPcp.getSubPoint().get(0);
+					toPcp = toPcp.getDualSub();
 				newPcp.insert(toPcp, Direction.NEXT);
 				newPcp.setWorldPosition(pos);
 				break;
@@ -473,6 +521,7 @@ public class ComponentUtils {
 				PipingRules.addSizeChange(true, pipeRun, other, (InlineComponent)newComponent, toPcp, null);
 			}
 			newPcp.setWorldPosition(pos);
+
 			// TODO : chicken-egg problem
 			newComponent.updateParameters();
 			Vector3d v = new Vector3d(dir);
@@ -490,6 +539,8 @@ public class ComponentUtils {
 				break;
 			}
 			newPcp.setWorldPosition(pos);
+	        if (inst.rotationAngle != null)
+	           ((InlineComponent) newComponent).setRotationAngle(inst.rotationAngle);
 			
 		}
 				
@@ -538,7 +589,7 @@ public class ComponentUtils {
 				requiresReverse = true;
 			}
 			PipeRun other = endCP.getPipeRun();
-			boolean mergeRuns = other == null ? true : pipeRun.equalSpecs(other);
+			boolean mergeRuns = other == null ? true : pipeRun.canMerge(other);
 			
 			if (requiresReverse) {
 				// Pipe line must be traversible with next/previous relations without direction change.
@@ -546,10 +597,11 @@ public class ComponentUtils {
 				PipingRules.reverse(other);
 				
 			}
+
 			if (mergeRuns) {
 				// Runs have compatible specs and must be merged
 				if (other != null && pipeRun != other)
-					PipingRules.merge(pipeRun, other);
+					pipeRun.merge(other);
 				else if (other == null) {
 					if (!(endTo instanceof Nozzle)) {
 						pipeRun.addChild(endTo);