X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FTurnComponent.java;h=5c3a1e981ee16fd1bd07674b62df1e8b8a9aef95;hb=ba83a8b8c95b94a035d20e458880beec68b9c450;hp=e25fd8d4ad206fbb2faae13cf9cc8a301af27676;hpb=b93886889422a3111b05a6944b3bcb2cdd8c416a;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
index e25fd8d4..5c3a1e98 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
@@ -1,14 +1,20 @@
 package org.simantics.plant3d.scenegraph;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.vecmath.Vector3d;
 
 import org.simantics.g3d.math.MathTools;
+import org.simantics.g3d.property.annotations.GetComboProperty;
+import org.simantics.g3d.property.annotations.GetComboPropertyValue;
 import org.simantics.g3d.property.annotations.GetPropertyValue;
+import org.simantics.g3d.property.annotations.SetComboPropertyValue;
 import org.simantics.g3d.property.annotations.SetPropertyValue;
 import org.simantics.g3d.scenegraph.base.ParentNode;
+import org.simantics.g3d.tools.NodeTools;
 import org.simantics.objmap.graph.annotations.DynamicGraphType;
 import org.simantics.objmap.graph.annotations.GetType;
 import org.simantics.objmap.graph.annotations.RelatedGetValue;
@@ -36,6 +42,9 @@ public class TurnComponent extends PipelineComponent {
 	public void setType(String type) throws Exception{
 		this.type = type;
 		controlPoint = ControlPointFactory.create(this);
+		syncNext();
+        syncPrevious();
+        syncBranch0();
 	}
 	
 	@Override
@@ -70,7 +79,7 @@ public class TurnComponent extends PipelineComponent {
 	@Override
 	public void updateParameters() {
 		super.updateParameters();
-		if (!isVariableAngle()) {
+		if (controlPoint.asFixedAngle()) {
 			Map<String,Object> calculated = getCalculatedParameters();
 			if (calculated.containsKey("length")) {
 				controlPoint.setLength((Double)calculated.get("length"));
@@ -79,14 +88,20 @@ public class TurnComponent extends PipelineComponent {
 		}
 	}
 	
-	@RelatedGetValue(Plant3D.URIs.HasTurnAngle)
 	public Double getTurnAngle() {
+	    return getControlPoint().getTurnAngle();
+	}
+	
+	@RelatedGetValue(Plant3D.URIs.HasTurnAngle)
+	public Double _getTurnAngle() {
+	    if (!getControlPoint().asFixedAngle())
+	        return null;
 		return getControlPoint().getTurnAngle();
 	}
 	
 	@RelatedSetValue(Plant3D.URIs.HasTurnAngle)
 	public void setTurnAngle(Double a) {
-		if (!getControlPoint().isFixed())
+		if (!getControlPoint().asFixedAngle())
 			return;
 		getControlPoint().setTurnAngle(a);            
 	}
@@ -103,15 +118,14 @@ public class TurnComponent extends PipelineComponent {
 		return getControlPoint().getTurnAxis();
 	}
 	
-	@GetPropertyValue(name="Turn Radius", value=Plant3D.URIs.HasTurnRadius, tabId = "Default")
-	public Double getTurnRadius() {
+    public Double getTurnRadius() {
 	    if (turnRadiusIndex != null)
 	        return getPipeRun().getTurnRadiusArray()[turnRadiusIndex];
 	    return getPipeRun().getTurnRadiusArray()[0];
 	}
 	
 	@RelatedGetValue(Plant3D.URIs.HasTurnRadiusIndex)
-	@GetPropertyValue(name="Turn Radius Index", value=Plant3D.URIs.HasTurnRadiusIndex, tabId = "Default")
+	@GetComboPropertyValue(name="Turn Radius", value=Plant3D.URIs.HasTurnRadiusIndex, tabId = "Default")
 	public Integer getTurnRadiusIndex() 
 	{
         // TODO: For backwards compatibility, we do not accept null values. 
@@ -122,13 +136,13 @@ public class TurnComponent extends PipelineComponent {
 	}
 	
 	@RelatedSetValue(Plant3D.URIs.HasTurnRadiusIndex)
-	@SetPropertyValue(value=Plant3D.URIs.HasTurnRadiusIndex)
+	@SetComboPropertyValue(value=Plant3D.URIs.HasTurnRadiusIndex)
     public void setTurnRadiusIndex(Integer turnRadiusIndex) {
 	    if (this.turnRadiusIndex == turnRadiusIndex)
 	        return;
 	    if (turnRadiusIndex == null)
 	        return;
-	    if (turnRadiusIndex != null) {
+	    if (turnRadiusIndex != null && getPipeRun() != null) {
 	        if (getPipeRun().getTurnRadiusArray().length <= turnRadiusIndex)
 	            return;
 	    }
@@ -137,10 +151,19 @@ public class TurnComponent extends PipelineComponent {
         PipingRules.requestUpdate(getControlPoint());
     }
 	
+	@GetComboProperty(value=Plant3D.URIs.HasTurnRadiusIndex)
+	public List<Double> _getTurnRadii() {
+	    List<Double> values = new ArrayList<Double>();
+	    for (double d : getPipeRun().getTurnRadiusArray())
+	        values.add(d);
+	    return values;
+	}
+	
+	
 	@RelatedGetValue(Plant3D.URIs.HasRotationAngle)
 	@GetPropertyValue(name="Rotation Angle", value=Plant3D.URIs.HasRotationAngle, tabId = "Default")
 	public Double getRotationAngle() {
-		if (!controlPoint.isFixed())
+		if (!controlPoint.asFixedAngle())
 			return null;
 		Double d = controlPoint.getRotationAngle();
 		if (d == null)
@@ -150,7 +173,7 @@ public class TurnComponent extends PipelineComponent {
 	@RelatedSetValue(Plant3D.URIs.HasRotationAngle)
 	@SetPropertyValue(value=Plant3D.URIs.HasRotationAngle)
 	public void setRotationAngle(Double angle) {
-		if (!controlPoint.isFixed())
+		if (!controlPoint.asFixedAngle())
 			return;
 		
 		if (angle == null || Double.isInfinite(angle) || Double.isNaN(angle)) {
@@ -166,14 +189,14 @@ public class TurnComponent extends PipelineComponent {
 	@RelatedGetValue(Plant3D.URIs.IsReversed)
 	@GetPropertyValue(name="Reverse", value=Plant3D.URIs.IsReversed, tabId = "Default")
 	public Boolean isReversed() {
-		if (!controlPoint.isFixed())
+		if (!controlPoint.asFixedAngle())
 			return null;
 		Boolean d = controlPoint._getReversed();
 		return d;
 	}
 	@RelatedSetValue(Plant3D.URIs.IsReversed)
 	public void setReversed(Boolean reverse) {
-		if (!controlPoint.isFixed())
+		if (!controlPoint.asFixedAngle())
 			return;
 		
 		if (reverse == null) {
@@ -190,4 +213,38 @@ public class TurnComponent extends PipelineComponent {
 		else
 			return new double[]{1.0,0.0,0.0};
 	}
+	
+	/**
+	 * Turn is a section of a circle; this method returns center of that circle.
+	 * @return
+	 */
+	public Vector3d getCenterPosition() {
+	    // getPosition() is control point position, located outside of turn
+        // we need to calculate position in the middle of the turn
+        double t = Math.tan((Math.PI - getControlPoint().getTurnAngle()) * 0.5);
+        double tr = getTurnRadius();
+        double R = 0.0;
+        if (t > MathTools.NEAR_ZERO)
+            R = tr / t;
+        Vector3d localC = new Vector3d(-R, 0.0, -tr);
+        // worldC is center of a circle
+        Vector3d worldC = NodeTools.getWorldPosition(this,localC);
+        return worldC;
+	}
+	
+	/**
+	 * Returns position in the middle of turn component
+	 * @return
+	 */
+	public Vector3d getMiddlePosition() {
+	    Vector3d pos = getWorldPosition();
+	    Vector3d worldC = getCenterPosition();
+	    
+	    // calculate vector from center to edge, which is middle of the turn
+        pos.sub(worldC);
+        pos.normalize();
+        pos.scale(getTurnRadius());
+        pos.add(worldC);
+        return pos;
+	}
 }