From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Mon, 9 Mar 2020 09:03:21 +0000 (+0200)
Subject: Add a wall thickness property to pipe runs.
X-Git-Tag: v1.43.0~44
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=d515401dd50a89bb6f0f5c8d75e045a96db39f51;p=simantics%2F3d.git

Add a wall thickness property to pipe runs.

gitlab #104

Change-Id: Ib21da6f7aee8c2bb1aa74b9a43cdf72264e9f689
---

diff --git a/org.simantics.plant3d.ontology/graph/plant3d.pgraph b/org.simantics.plant3d.ontology/graph/plant3d.pgraph
index d6029cc6..1fe9540b 100644
--- a/org.simantics.plant3d.ontology/graph/plant3d.pgraph
+++ b/org.simantics.plant3d.ontology/graph/plant3d.pgraph
@@ -105,6 +105,8 @@ P3D.HasBranch9 <R P3D.Connects
     
 P3D.HasPipeDiameter <R G3D.hasNonTransformation
     L0.HasRange L0.Double
+P3D.HasPipeThickness <R G3D.hasNonTransformation
+    L0.HasRange L0.Double
 P3D.HasRotationAngle <R G3D.hasTransformation
     L0.HasRange L0.Double
 P3D.HasLength <R G3D.hasNonTransformation
diff --git a/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java b/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java
index c60908ba..950f8408 100644
--- a/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java
+++ b/org.simantics.plant3d.ontology/src/org/simantics/plant3d/ontology/Plant3D.java
@@ -74,6 +74,8 @@ public class Plant3D {
     public final Resource HasPipeDiameter;
     public final Resource HasPipeDiameter_Inverse;
     public final Resource HasPipeRun;
+    public final Resource HasPipeThickness;
+    public final Resource HasPipeThickness_Inverse;
     public final Resource HasPrevious;
     public final Resource HasRotationAngle;
     public final Resource HasRotationAngle_Inverse;
@@ -194,6 +196,8 @@ public class Plant3D {
         public static final String HasPipeDiameter = "http://www.simantics.org/Plant3D-0.1/HasPipeDiameter";
         public static final String HasPipeDiameter_Inverse = "http://www.simantics.org/Plant3D-0.1/HasPipeDiameter/Inverse";
         public static final String HasPipeRun = "http://www.simantics.org/Plant3D-0.1/HasPipeRun";
+        public static final String HasPipeThickness = "http://www.simantics.org/Plant3D-0.1/HasPipeThickness";
+        public static final String HasPipeThickness_Inverse = "http://www.simantics.org/Plant3D-0.1/HasPipeThickness/Inverse";
         public static final String HasPrevious = "http://www.simantics.org/Plant3D-0.1/HasPrevious";
         public static final String HasRotationAngle = "http://www.simantics.org/Plant3D-0.1/HasRotationAngle";
         public static final String HasRotationAngle_Inverse = "http://www.simantics.org/Plant3D-0.1/HasRotationAngle/Inverse";
@@ -324,6 +328,8 @@ public class Plant3D {
         HasPipeDiameter = getResourceOrNull(graph, URIs.HasPipeDiameter);
         HasPipeDiameter_Inverse = getResourceOrNull(graph, URIs.HasPipeDiameter_Inverse);
         HasPipeRun = getResourceOrNull(graph, URIs.HasPipeRun);
+        HasPipeThickness = getResourceOrNull(graph, URIs.HasPipeThickness);
+        HasPipeThickness_Inverse = getResourceOrNull(graph, URIs.HasPipeThickness_Inverse);
         HasPrevious = getResourceOrNull(graph, URIs.HasPrevious);
         HasRotationAngle = getResourceOrNull(graph, URIs.HasRotationAngle);
         HasRotationAngle_Inverse = getResourceOrNull(graph, URIs.HasRotationAngle_Inverse);
diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
index 9b3d9083..8dcee926 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
@@ -95,6 +95,7 @@ public class AddComponentAction extends vtkSwtAction {
 	private Double angle;
 	private Double rotationAngle;
 	private Double diameter;
+	private Double thickness;
 	private Double turnRadius;
 	
 	@Override
@@ -119,6 +120,7 @@ public class AddComponentAction extends vtkSwtAction {
 		this.angle = dialog.getAngle();
 		this.rotationAngle = dialog.getRotationAngle();
 		this.diameter = dialog.getDiameter();
+		this.thickness = dialog.getThickness();
 		this.turnRadius = dialog.getTurnRadius();
 		allowed = dialog.filterAllowed();
 		gizmo.setComponent(component, allowed);
@@ -198,6 +200,7 @@ public class AddComponentAction extends vtkSwtAction {
 			inst.name = name;
 			inst.angle = angle != null ? MathTools.degToRad(angle) : null;
 			inst.diameter = diameter;
+			inst.thickness = thickness;
 			inst.length = length;
 			inst.turnRadius = turnRadius;
 			inst.insertPosition = insertPosition;
diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
index 030cce9f..c0851fd2 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -88,9 +88,11 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 
 	// Input for new PipeRun
 	private Double diameter;
+	private Double thickness;
 	private Double turnRadius;
 
 	private Text diameterText;
+	private Text thicknessText;
 	private Text turnRadiusText;
 
 	// Position selection
@@ -305,7 +307,10 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		label.setText("Diameter");
 		diameterText = new Text(composite, SWT.SINGLE | SWT.BORDER);
 		label = new Label(composite, SWT.NONE);
-		label.setText("Turn Radius");
+		label.setText("Wall thickness");
+		thicknessText = new Text(composite, SWT.SINGLE | SWT.BORDER);
+		label = new Label(composite, SWT.NONE);
+		label.setText("Turn radius");
 		turnRadiusText = new Text(composite, SWT.SINGLE | SWT.BORDER);
 
 		lengthText.setEnabled(false);
@@ -313,6 +318,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		rotationAngleText.setEnabled(false);
 		turnRadiusText.setEnabled(false);
 		diameterText.setEnabled(false);
+		thicknessText.setEnabled(false);
 
 		nameText.addKeyListener(new KeyAdapter() {
 			@Override
@@ -369,6 +375,18 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 				validate();
 			}
 		});
+		
+		thicknessText.addKeyListener(new KeyAdapter() {
+			@Override
+			public void keyReleased(KeyEvent e) {
+				try {
+					thickness = Double.parseDouble(thicknessText.getText()) / lengthFactor;
+				} catch (NumberFormatException err) {
+					thickness = null;
+				}
+				validate();
+			}
+		});
 
 		turnRadiusText.addKeyListener(new KeyAdapter() {
 			@Override
@@ -387,6 +405,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		horizFillData.applyTo(angleText);
 		horizFillData.applyTo(rotationAngleText);
 		horizFillData.applyTo(diameterText);
+		horizFillData.applyTo(thicknessText);
 		horizFillData.applyTo(turnRadiusText);
 
 		if (!allowed.contains(PositionType.NEXT) && !allowed.contains(PositionType.PREVIOUS)) {
@@ -542,7 +561,8 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 			if (selected.isSizeChange()) {
 				turnRadiusText.setEnabled(true);
 				diameterText.setEnabled(true);
-				if (diameter == null || turnRadius == null)
+				thicknessText.setEnabled(true);
+				if (diameter == null || turnRadius == null || thickness == null)
 					ok = false;
 			} else {
 				turnRadiusText.setEnabled(false);
@@ -631,4 +651,8 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		return lenghtAdjustable;
 	}
 
+	public Double getThickness() {
+		return thickness;
+	}
+
 }
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..0284d1c7 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,29 @@ 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);
+	}
+	
 	@RelatedElementsAdd(Plant3D.URIs.children)
 	public void addChild(PipelineComponent node) {
 		addNode(Plant3D.URIs.children,node);
diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
index 8f1b9a88..08fa2622 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/controlpoint/PipeControlPoint.java
@@ -1448,6 +1448,7 @@ public class PipeControlPoint extends G3DNode implements IP3DNode {
             
             PipeRun previousRun = previous.getPipeRun();
             nextPipeRun.setPipeDiameter(previousRun.getPipeDiameter());
+            nextPipeRun.setPipeThickness(previousRun.getPipeThickness());
             nextPipeRun.setTurnRadiusArray(previousRun.getTurnRadiusArray());
             
             PipelineComponent n = next.getPipelineComponent();
diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
index 2cef7060..6bbabe1e 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
@@ -281,6 +281,7 @@ public class ComponentUtils {
 		
 		// Reducer requires pipe specs
 		public Double diameter;
+		public Double thickness;
 		public Double turnRadius;
 		
 		// Variable length 
@@ -331,6 +332,14 @@ public class ComponentUtils {
 		public void setDiameter(Double diameter) {
 			this.diameter = diameter;
 		}
+		
+		public double getThickness() {
+			return thickness;
+		}
+		
+		public void setThickness(double thickness) {
+			this.thickness = thickness;
+		}
 
 		public Double getTurnRadius() {
 			return turnRadius;
@@ -537,6 +546,7 @@ public class ComponentUtils {
 			String n = root.getUniqueName("PipeRun");
 			other.setName(n);
 			other.setPipeDiameter(inst.diameter);
+			other.setPipeThickness(inst.thickness);
 			other.setTurnRadius(inst.turnRadius);
 			root.addChild(other);