Ask component rotation angle when adding components

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / utils / ComponentUtils.java

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 50ede807e6dac4039e2aee555174a088df24c80a..0ae36e33a2f51ca7a3aa549c14244f4547c873c9 100644 (file)
--- 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;
+        }
 
        }
        
@@ -408,14 +443,25 @@ public class ComponentUtils {
 
                        pipeRun.addChild(newComponent);
 
-                       if (newComponent instanceof InlineComponent && ((InlineComponent)newComponent).isVariableLength() ||((InlineComponent)newComponent).isModifialble()) {
-                               newPcp.setLength(inst.length);
-                               newComponent.setParameter("length", inst.length);
-                       } else if (newComponent instanceof TurnComponent && ((TurnComponent)newComponent).isVariableAngle()) {
-                               newPcp.setTurnAngle(inst.angle);
-                               newComponent.setParameter("turnAngle", 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);
@@ -475,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);
@@ -492,6 +539,8 @@ public class ComponentUtils {
                                break;
                        }
                        newPcp.setWorldPosition(pos);
+               if (inst.rotationAngle != null)
+                  ((InlineComponent) newComponent).setRotationAngle(inst.rotationAngle);
                        
                }