Use inside diameter for eccentric reducer offset calculation

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / scenegraph / PipeRun.java

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 86f649aa136e49b6d0f7ac00cf956fb7de9e4392..0a6e58c07c365f664263291aeee53787474f295d 100644 (file)
--- 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);