Allow PipeRun merges when diameters are the same

[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 574206dae05211ffe29f000f0357cb6470f90b53..14dce68dc351c71c913141c27f3aeb2239280eb7 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
@@ -5,7 +5,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.vecmath.Point3d;
 import javax.vecmath.Vector3d;
 
 import org.simantics.Simantics;
@@ -16,7 +15,9 @@ import org.simantics.db.common.utils.NameUtils;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.g3d.math.MathTools;
 import org.simantics.g3d.scenegraph.GeometryProvider;
+import org.simantics.g3d.scenegraph.ParametricGeometryProvider;
 import org.simantics.layer0.Layer0;
+import org.simantics.plant3d.geometry.ParameterRead;
 import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.EndComponent;
 import org.simantics.plant3d.scenegraph.Equipment;
@@ -49,6 +50,8 @@ public class ComponentUtils {
                                types.add(Plant3D.URIs.Builtin_ConcentricReducer);
                                types.add(Plant3D.URIs.Builtin_BranchSplitComponent);
                                types.add(Plant3D.URIs.Builtin_EccentricReducer);
+                               types.add(Plant3D.URIs.Builtin_Elbow45);
+                               types.add(Plant3D.URIs.Builtin_Elbow90);
                                
                                for (String typeURI : types) {
                                        load(graph, typeURI);
@@ -72,6 +75,11 @@ public class ComponentUtils {
                }
                if (geom != null) {
                        GeometryProvider provider = graph.adapt(geom, GeometryProvider.class);
+                       if (provider instanceof ParametricGeometryProvider) {
+                       Map<String,Object> params = graph.syncRequest(new ParameterRead(type));
+                       if (params.size() > 0)
+                           ((ParametricGeometryProvider)provider).setProperties(params);
+                       }
                        return provider;
                }
                return null;
@@ -203,7 +211,6 @@ public class ComponentUtils {
                Equipment equipment = createEquipment(root, equipmentType.getUri());
                String n = root.getUniqueName(equipmentType.getName());
                equipment.setName(n);
-               root.addChild(equipment);
                return equipment;
        }
        
@@ -337,7 +344,7 @@ public class ComponentUtils {
                        switch (position) {
                        case NEXT: 
                                if (toPcp.isDualInline()) {
-                                       toPcp = toPcp.getSubPoint().get(0);
+                                       toPcp = toPcp.getDualSub();
                                        pipeRun = toPcp.getPipeRun();
                                }
                                
@@ -348,6 +355,8 @@ public class ComponentUtils {
                                        pipeRun = toPcp.getPipeRun();
                                }
                                break;
+                       default:
+                               break;
                        }
                        Vector3d start = new Vector3d();
                        Vector3d end = new Vector3d();
@@ -364,12 +373,14 @@ public class ComponentUtils {
                        case SPLIT:
                                pos = new Vector3d(toPcp.getWorldPosition());
                                break;
+                       default:
+                               break;
                        }
 
                } else if (toPcp.isDirected()) {
                        dir = new Vector3d(toPcp.getDirection(Direction.NEXT));
                        pos = new Vector3d(toPcp.getWorldPosition());
-               } else if (toPcp.isTurn() && toPcp.isFixed()) {
+               } else if (toPcp.isTurn() && toPcp.asFixedAngle()) {
                        dir = new Vector3d(toPcp.getDirection(position == PositionType.NEXT ? Direction.NEXT : Direction.PREVIOUS));
                        pos = new Vector3d(toPcp.getWorldPosition());
                        if (!lengthAdjustable) {
@@ -425,12 +436,14 @@ public class ComponentUtils {
                                break;
                        case SPLIT:
                                break;
+                       default:
+                               break;
                        }
                        
                        switch (position) {
                        case NEXT: 
                                if (toPcp.isDualInline())
-                                       toPcp = toPcp.getSubPoint().get(0);
+                                       toPcp = toPcp.getDualSub();
                                newPcp.insert(toPcp, Direction.NEXT);
                                newPcp.setWorldPosition(pos);
                                break;
@@ -442,6 +455,8 @@ public class ComponentUtils {
                                break;
                        case SPLIT:
                                PipingRules.splitVariableLengthComponent(newComponent, (InlineComponent)component, true);
+                       default:
+                               break;
                        }
                } else {
                        PipeRun other = new PipeRun();
@@ -471,6 +486,8 @@ public class ComponentUtils {
                                break;
                        case SPLIT:
                                break;
+                       default:
+                               break;
                        }
                        newPcp.setWorldPosition(pos);
                        
@@ -521,7 +538,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.
@@ -529,10 +546,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);
@@ -551,7 +569,6 @@ public class ComponentUtils {
                                // Runs do not have compatible specs, and a reducer must be attached in between.
                                InlineComponent reducer = ComponentUtils.createReducer(root);
                                PipeControlPoint pcp = reducer.getControlPoint();
-                               PipeControlPoint ocp = pcp.getSubPoint().get(0);
                                
                                Vector3d endPos = endCP.getWorldPosition();
                                Vector3d currentPos = currentCP.getWorldPosition();