X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FPipeRun.java;h=86f649aa136e49b6d0f7ac00cf956fb7de9e4392;hb=9f84331c9967c88e0e5550ce91f2b7e364a5cb6d;hp=2c334c1f2810f085f0deaad34028ea9d2a28994c;hpb=e92fe8961f1de7bc132e64814bba4c5f92f67ba6;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipeRun.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipeRun.java
index 2c334c1f..86f649aa 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipeRun.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipeRun.java
@@ -1,12 +1,14 @@
 package org.simantics.plant3d.scenegraph;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.simantics.g3d.math.MathTools;
 import org.simantics.g3d.property.annotations.GetPropertyValue;
@@ -64,6 +66,8 @@ public class PipeRun extends P3DParentNode<IP3DNode> {
 	@RelatedSetValue(Plant3D.URIs.HasTurnRadius)
 	@SetPropertyValue(Plant3D.URIs.HasTurnRadius)
 	public void setTurnRadius(double turnRadius) {
+		if (this.turnRadius[0] == turnRadius)
+			return;
 		this.turnRadius[0] = turnRadius;
 		firePropertyChanged(Plant3D.URIs.HasTurnRadius);
 		firePropertyChanged(Plant3D.URIs.HasTurnRadiusArray);
@@ -78,7 +82,7 @@ public class PipeRun extends P3DParentNode<IP3DNode> {
     @RelatedSetValue(Plant3D.URIs.HasTurnRadiusArray)
     @SetPropertyValue(Plant3D.URIs.HasTurnRadiusArray)
     public void setTurnRadiusArray(double[] turnRadiusArray) {
-        if (turnRadiusArray == null || turnRadiusArray.length == 0)
+        if (turnRadiusArray == null || turnRadiusArray.length == 0 || Arrays.equals(this.turnRadius, turnRadiusArray))
             return;
         this.turnRadius = turnRadiusArray;
         firePropertyChanged(Plant3D.URIs.HasTurnRadiusArray);
@@ -93,7 +97,10 @@ public class PipeRun extends P3DParentNode<IP3DNode> {
 	@RelatedSetValue(Plant3D.URIs.HasPipeDiameter)
 	@SetPropertyValue(Plant3D.URIs.HasPipeDiameter)
 	public void setPipeDiameter(double pipeDiameter) {
-		this.pipeDiameter = pipeDiameter;	
+		if (Objects.equals(this.pipeDiameter, pipeDiameter))
+			return;
+		
+		this.pipeDiameter = pipeDiameter;
 		firePropertyChanged(Plant3D.URIs.HasPipeDiameter);
 	}
 	
@@ -112,8 +119,22 @@ public class PipeRun extends P3DParentNode<IP3DNode> {
 	}
 	
 	@RelatedElementsRem(Plant3D.URIs.children)
+	public void _remChild(PipelineComponent node) {
+		//since we do not now, if DB remove is actually remove or detach, we have to use detach. NodeMap will handle Component removals.
+	    deattachNode(Plant3D.URIs.children, node);
+	}
+	
 	public void remChild(PipelineComponent node) {
-		removeNode(Plant3D.URIs.children, node);
+	    removeNode(Plant3D.URIs.children, node);
+	}
+	
+	@Override
+	public void remove() {
+	    // since we do not now, if DB remove is actually remove or detach, we have to use detach. NodeMap will handle Component removals.
+	    Collection<PipelineComponent> comps = getChild();
+	    for (PipelineComponent c : comps)
+	        c.deattach();
+	    super.remove();
 	}