X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FPipeRun.java;h=0a6e58c07c365f664263291aeee53787474f295d;hb=bd522622ca0d62dff1b2025680b042e7ffebc279;hp=86f649aa136e49b6d0f7ac00cf956fb7de9e4392;hpb=9f84331c9967c88e0e5550ce91f2b7e364a5cb6d;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 86f649aa..0a6e58c0 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipeRun.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipeRun.java
@@ -8,7 +8,6 @@ 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;
@@ -33,6 +32,7 @@ import vtk.vtkRenderer;
 public class PipeRun extends P3DParentNode<IP3DNode> {
 	
 	private double pipeDiameter = 0.1;
+	private double pipeThickness = 0.0;
 	private double[] turnRadius = new double[] {0.2};
 	
 	@Override
@@ -97,13 +97,33 @@ public class PipeRun extends P3DParentNode<IP3DNode> {
 	@RelatedSetValue(Plant3D.URIs.HasPipeDiameter)
 	@SetPropertyValue(Plant3D.URIs.HasPipeDiameter)
 	public void setPipeDiameter(double pipeDiameter) {
-		if (Objects.equals(this.pipeDiameter, pipeDiameter))
+		if (this.pipeDiameter == pipeDiameter)
 			return;
 		
 		this.pipeDiameter = pipeDiameter;
 		firePropertyChanged(Plant3D.URIs.HasPipeDiameter);
 	}
 	
+	@RelatedGetValue(Plant3D.URIs.HasPipeThickness)
+	@GetPropertyValue(value=Plant3D.URIs.HasPipeThickness, name = "Wall Thickness")
+	public double getPipeThickness() {
+		return pipeThickness;
+	}
+	
+	@RelatedSetValue(Plant3D.URIs.HasPipeThickness)
+	@SetPropertyValue(Plant3D.URIs.HasPipeThickness)
+	public void setPipeThickness(double pipeThickness) {
+		if (this.pipeThickness == pipeThickness)
+			return;
+		
+		this.pipeThickness = pipeThickness;
+		firePropertyChanged(Plant3D.URIs.HasPipeThickness);
+	}
+	
+	public double getInsideDiameter() {
+		return pipeDiameter - 2 * pipeThickness;
+	}
+	
 	@RelatedElementsAdd(Plant3D.URIs.children)
 	public void addChild(PipelineComponent node) {
 		addNode(Plant3D.URIs.children,node);