Allow multiple radii for turns.

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

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 5f8139f42d919bfb40f3a22131f7302a1a25f85d..e25fd8d4ad206fbb2faae13cf9cc8a301af27676 100644 (file)
--- 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 {
@@ -21,6 +25,7 @@ public class TurnComponent extends PipelineComponent {
        
        private String type;
        private PipeControlPoint controlPoint;
+       private Integer turnRadiusIndex;
        
        @GetType(Plant3D.URIs.TurnComponent)
        public String getType() {
@@ -48,10 +53,9 @@ public class TurnComponent extends PipelineComponent {
        public Map<String, Object> updateParameterMap() {
                Map<String,Object> map = new HashMap<String, Object>();
                
-               PipeRun pipeRun = getPipeRun();
-               if (pipeRun != null) {
-                       map.put("turnRadius", pipeRun.getTurnRadius());
-                       map.put("radius", pipeRun.getPipeDiameter() * 0.5);
+               if (getPipeRun() != null) {
+               map.put("turnRadius", getTurnRadius());
+               map.put("radius", getDiameter() * 0.5);
                }
                if (controlPoint != null && controlPoint.getTurnAngle() != null  && !Double.isNaN(controlPoint.getTurnAngle())) {
                        map.put("turnAngle", controlPoint.getTurnAngle());
@@ -59,11 +63,34 @@ 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"));
+                       }
+                       PipingRules.requestUpdate(getControlPoint());
+               }
+       }
+       
+       @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,9 +103,84 @@ public class TurnComponent extends PipelineComponent {
                return getControlPoint().getTurnAxis();
        }
        
-       @Override
-       public Vector3d getNormal() {
-               return getTurnAxis();
+       @GetPropertyValue(name="Turn Radius", value=Plant3D.URIs.HasTurnRadius, tabId = "Default")
+       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")
+       public Integer getTurnRadiusIndex() 
+       {
+        // TODO: For backwards compatibility, we do not accept null values. 
+        //       One development path would allow null index, and setting custom turn radius for the component.
+        if (turnRadiusIndex == null)
+               return 0;
+           return turnRadiusIndex;
+       }
+       
+       @RelatedSetValue(Plant3D.URIs.HasTurnRadiusIndex)
+       @SetPropertyValue(value=Plant3D.URIs.HasTurnRadiusIndex)
+    public void setTurnRadiusIndex(Integer turnRadiusIndex) {
+           if (this.turnRadiusIndex == turnRadiusIndex)
+               return;
+           if (turnRadiusIndex == null)
+               return;
+           if (turnRadiusIndex != null) {
+               if (getPipeRun().getTurnRadiusArray().length <= turnRadiusIndex)
+                   return;
+           }
+           this.turnRadiusIndex = turnRadiusIndex;
+        firePropertyChanged(Plant3D.URIs.HasTurnRadiusIndex);
+        PipingRules.requestUpdate(getControlPoint());
+    }
+       
+       @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);
+               PipingRules.requestUpdate(getControlPoint());
+       }
+       
+       @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)
+       public void setReversed(Boolean reverse) {
+               if (!controlPoint.isFixed())
+                       return;
+               
+               if (reverse == null) {
+                       return;
+               }
+               controlPoint.setReversed(reverse);
+               PipingRules.requestUpdate(getControlPoint()); 
        }
        
        @Override