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=100852bf5fe01aeeb59e1caec34323c43a48606b;hb=refs%2Fchanges%2F62%2F3862%2F1;hp=d27de99b2fd4142be90cfc34a458f50d0228ed36;hpb=b0990f056daad24134642fd7a2406d17397002ae;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 d27de99b..100852bf 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
@@ -138,8 +138,11 @@ public class PipingRules {
 	
 	public static void setEnabled(boolean enabled) {
 		PipingRules.enabled = enabled;
-		if(!enabled)
-			currentUpdates.clear();
+		if(!enabled) {
+			synchronized (ruleMutex) {
+				currentUpdates.clear();
+			}
+		}
 	}
 	
 	public static boolean isEnabled() {
@@ -277,6 +280,9 @@ public class PipingRules {
 		scp.insert(pcp1, pcp2);
 
 		scp.setWorldPosition(pos);
+		Vector3d dir = new Vector3d();
+		dir.sub(pcp2.getWorldPosition(), pcp1.getWorldPosition());
+		updateControlPointOrientation(scp, dir);
 		scp.setLength(length);
 		validate(scp.getPipeRun());
 		return scp;
@@ -363,11 +369,11 @@ public class PipingRules {
 
 	}
 
-	private static boolean calculateDirectedOffset(Vector3d startPoint, Vector3d endPoint, PipeControlPoint start, ArrayList<PipeControlPoint> list, PipeControlPoint end, Vector3d dir, Vector3d offset) {
+	public static boolean calculateDirectedOffset(Vector3d startPoint, Vector3d endPoint, PipeControlPoint start, ArrayList<PipeControlPoint> list, PipeControlPoint end, Vector3d dir, Vector3d offset) {
 		return calculateOffset(startPoint, endPoint, start, list, end, dir, offset, true);
 	}
 
-	private static boolean calculateOffset(Vector3d startPoint, Vector3d endPoint, PipeControlPoint start, ArrayList<PipeControlPoint> list, PipeControlPoint end, Vector3d dir, Vector3d offset) {
+	public static boolean calculateOffset(Vector3d startPoint, Vector3d endPoint, PipeControlPoint start, ArrayList<PipeControlPoint> list, PipeControlPoint end, Vector3d dir, Vector3d offset) {
 		return calculateOffset(startPoint, endPoint, start, list, end, dir, offset, false);
 	}
 	
@@ -908,7 +914,11 @@ public class PipingRules {
 		Vector3d dir = new Vector3d();
 		dir.sub(currentPos, prevPos);
 		
-		boolean simple = currentUpdates.contains(icp);
+		boolean simple;
+		synchronized (ruleMutex) {
+			simple = currentUpdates.contains(icp);
+		}
+		
 		if (simple) {
 			// Update based on position -> adjust length
 			double currentLength = (dir.length() - prev.getInlineLength()) * 2.0;