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=2c5f7427c7143430beb56edb57583ee31fbafbbb;hb=8334f50b69e1cdba45ed26d49f193d26d728b1fc;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..2c5f7427 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() {
@@ -363,11 +366,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 +911,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;