X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fscenegraph%2FTurnComponent.java;h=ff12143bcf01dd4497299aad442e42bdd1319ff7;hb=53d55c24c779745f188bdb18d32f71d20acb61b2;hp=6050b60ff9c8d779fca938d6b8907093f3598fe4;hpb=22bb24d2a7e26c70b0dd4c57080f2c25ac3d40a8;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 6050b60f..ff12143b 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
@@ -7,13 +7,17 @@ import javax.vecmath.Vector3d;
 
 import org.simantics.g3d.math.MathTools;
 import org.simantics.g3d.property.annotations.GetPropertyValue;
+import org.simantics.g3d.property.annotations.SetPropertyValue;
 import org.simantics.g3d.scenegraph.base.ParentNode;
 import org.simantics.objmap.graph.annotations.DynamicGraphType;
 import org.simantics.objmap.graph.annotations.GetType;
+import org.simantics.objmap.graph.annotations.RelatedGetValue;
+import org.simantics.objmap.graph.annotations.RelatedSetValue;
 import org.simantics.objmap.graph.annotations.SetType;
 import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.controlpoint.ControlPointFactory;
 import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint;
+import org.simantics.plant3d.scenegraph.controlpoint.PipingRules;
 
 @DynamicGraphType(Plant3D.URIs.TurnComponent)
 public class TurnComponent extends PipelineComponent {
@@ -59,11 +63,33 @@ public class TurnComponent extends PipelineComponent {
 		return map;
 	}
 	
+	public boolean isVariableAngle() {
+		return !controlPoint.isFixed();
+	}
+	
+	@Override
+	public void updateParameters() {
+		super.updateParameters();
+		if (!isVariableAngle()) {
+			Map<String,Object> calculated = getCalculatedParameters();
+			if (calculated.containsKey("length")) {
+				controlPoint.setLength((Double)calculated.get("length"));
+			}
+		}
+	}
 	
+	@RelatedGetValue(Plant3D.URIs.HasTurnAngle)
 	public Double getTurnAngle() {
 		return getControlPoint().getTurnAngle();
 	}
 	
+	@RelatedSetValue(Plant3D.URIs.HasTurnAngle)
+	public void setTurnAngle(Double a) {
+		if (!getControlPoint().isFixed())
+			return;
+		getControlPoint().setTurnAngle(a);            
+	}
+	
 	@GetPropertyValue(name="Turn Angle", value="turn angle", tabId = "Default")
 	public Double getTurnAngleDeg() {
 		Double d = getControlPoint().getTurnAngle();
@@ -76,8 +102,68 @@ public class TurnComponent extends PipelineComponent {
 		return getControlPoint().getTurnAxis();
 	}
 	
+	@RelatedGetValue(Plant3D.URIs.HasRotationAngle)
+	@GetPropertyValue(name="Rotation Angle", value=Plant3D.URIs.HasRotationAngle, tabId = "Default")
+	public Double getRotationAngle() {
+		if (!controlPoint.isFixed())
+			return null;
+		Double d = controlPoint.getRotationAngle();
+		if (d == null)
+			return 0.0;
+		return MathTools.radToDeg(d);
+	}
+	@RelatedSetValue(Plant3D.URIs.HasRotationAngle)
+	@SetPropertyValue(value=Plant3D.URIs.HasRotationAngle)
+	public void setRotationAngle(Double angle) {
+		if (!controlPoint.isFixed())
+			return;
+		
+		if (angle == null || Double.isInfinite(angle) || Double.isNaN(angle)) {
+			return;
+		}
+		angle = MathTools.degToRad(angle);
+		if (controlPoint.getRotationAngle() != null && Math.abs(controlPoint.getRotationAngle()-angle) < MathTools.NEAR_ZERO)
+			return;
+		controlPoint.setRotationAngle(angle);
+		try {
+			PipingRules.requestUpdate(getControlPoint());
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}   
+	}
+	
+	@RelatedGetValue(Plant3D.URIs.IsReversed)
+	@GetPropertyValue(name="Reverse", value=Plant3D.URIs.IsReversed, tabId = "Default")
+	public Boolean isReversed() {
+		if (!controlPoint.isFixed())
+			return null;
+		Boolean d = controlPoint._getReversed();
+		return d;
+	}
+	@RelatedSetValue(Plant3D.URIs.IsReversed)
+	//@SetPropertyValue(value=Plant3D.URIs.IsReversed)
+	public void setReversed(Boolean reverse) {
+		if (!controlPoint.isFixed())
+			return;
+		
+		if (reverse == null) {
+			return;
+		}
+		controlPoint.setReversed(reverse);
+		try {
+			PipingRules.requestUpdate(getControlPoint());
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}   
+	}
+	
 	@Override
-	public Vector3d getNormal() {
-		return getTurnAxis();
+	protected double[] getColor() {
+		if (getControlPoint() == null || !getControlPoint().isFixed())
+			return new double[]{0.6,0.6,0.6};
+		else
+			return new double[]{1.0,0.0,0.0};
 	}
 }