X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2Fcontrolpoint%2FPipingRules.java;h=3ab4cca46892795d3f3931b1b00a651a5f0518a3;hb=e96447c877fd9c3a4664c2593cfbae768d0c44d7;hp=de96517552f7d6774f7c0ef0cf20c04820e17f93;hpb=1ca09aa9bae3ea1e3382ceff0a2a09427f173286;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java
index de965175..3ab4cca4 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipingRules.java
@@ -1671,7 +1671,11 @@ public class PipingRules {
 			pcps.add(points);
 			PipeControlPoint pcp = points.get(points.size()-1);
 			if (pcp.getChildPoints().size() > 0) {
-				pipeRun = pcp.getChildPoints().get(0).getPipeRun();
+				PipeRun pipeRun2 = pcp.getChildPoints().get(0).getPipeRun();
+				if (pipeRun == pipeRun2)
+				    break;
+				else
+				    pipeRun = pipeRun2;
 			} else {
 				break;
 			}
@@ -1770,30 +1774,7 @@ public class PipingRules {
 		}
 	}
 	
-	public static void merge(PipeRun run1, PipeRun r2) {
-		Map<PipeControlPoint, Vector3d> positions = new HashMap<PipeControlPoint, Vector3d>();
-		Map<PipeControlPoint, Quat4d> orientations = new HashMap<PipeControlPoint, Quat4d>();
-		for (PipeControlPoint pcp : r2.getControlPoints()) {
-			positions.put(pcp, pcp.getWorldPosition());
-			orientations.put(pcp, pcp.getWorldOrientation());
-		}
-		for (PipeControlPoint pcp : r2.getControlPoints()) {
-			r2.deattachChild(pcp);
-			run1.addChild(pcp);
-			PipelineComponent component = pcp.getPipelineComponent();
-			if (component != null) {
-				if (!(component instanceof Nozzle)) {
-					component.deattach();
-					run1.addChild(component);
-				} else {
-					Nozzle n = (Nozzle)component;
-					n.setPipeRun(run1);
-				}
-			}
-		}
-		r2.remove();
-		
-	}
+	
 	
 	public static void validate(PipeRun pipeRun) {
 		if (pipeRun == null)