Merge "Improve elbow placement when dual directed pathleg is no loner aligned"

[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 4f787b8c2a3f91b788d10e7c250c4812f04bdd71..0205f5a318f9778531a36160414ad99ab5d4f497 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/TurnComponent.java
@@ -102,11 +102,6 @@ public class TurnComponent extends PipelineComponent {
                return getControlPoint().getTurnAxis();
        }
        
-       @Override
-       public Vector3d getNormal() {
-               return getTurnAxis();
-       }
-       
        @RelatedGetValue(Plant3D.URIs.HasRotationAngle)
     @GetPropertyValue(name="Rotation Angle", value=Plant3D.URIs.HasRotationAngle, tabId = "Default")
     public Double getRotationAngle() {
@@ -137,6 +132,32 @@ public class TurnComponent extends PipelineComponent {
             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
        protected double[] getColor() {