Allow multiple radii for turns.

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

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 2932f1d2b1bc16a59d1e01d6d2e8d5791003c32e..36710e4fee17d16a5c10bed8f16b0059a38485e8 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipeRun.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/scenegraph/PipeRun.java
@@ -11,6 +11,7 @@ import org.simantics.g3d.property.annotations.GetPropertyValue;
 import org.simantics.g3d.property.annotations.PropertyTabBlacklist;
 import org.simantics.g3d.property.annotations.SetPropertyValue;
 import org.simantics.g3d.scenegraph.IG3DNode;
+import org.simantics.g3d.vtk.common.VtkView;
 import org.simantics.objmap.graph.annotations.GraphType;
 import org.simantics.objmap.graph.annotations.RelatedElementsAdd;
 import org.simantics.objmap.graph.annotations.RelatedElementsGet;
@@ -20,7 +21,6 @@ import org.simantics.objmap.graph.annotations.RelatedSetValue;
 import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint;
 
-import vtk.vtkPanel;
 import vtk.vtkProp3D;
 import vtk.vtkRenderer;
 
@@ -29,7 +29,7 @@ import vtk.vtkRenderer;
 public class PipeRun extends P3DParentNode<IP3DNode> {
        
        private double pipeDiameter = 0.1;
-       private double turnRadius = 0.2;
+       private double[] turnRadius = new double[] {0.2};
        
        @Override
        public void update(vtkRenderer ren) {
@@ -37,7 +37,7 @@ public class PipeRun extends P3DParentNode<IP3DNode> {
        }
        
        @Override
-       public void visualize(vtkPanel panel) {
+       public void visualize(VtkView panel) {
                
        }
        
@@ -54,15 +54,31 @@ public class PipeRun extends P3DParentNode<IP3DNode> {
        @RelatedGetValue(Plant3D.URIs.HasTurnRadius)
        @GetPropertyValue(value=Plant3D.URIs.HasTurnRadius, name = "Elbow radius")
        public double getTurnRadius() {
-               return turnRadius;
+               return turnRadius[0];
        }
        
        @RelatedSetValue(Plant3D.URIs.HasTurnRadius)
        @SetPropertyValue(Plant3D.URIs.HasTurnRadius)
        public void setTurnRadius(double turnRadius) {
-               this.turnRadius = turnRadius;
+               this.turnRadius[0] = turnRadius;
                firePropertyChanged(Plant3D.URIs.HasTurnRadius);
-       }
+               firePropertyChanged(Plant3D.URIs.HasTurnRadiusArray);
+       }
+       
+       @RelatedGetValue(Plant3D.URIs.HasTurnRadiusArray)
+    @GetPropertyValue(value=Plant3D.URIs.HasTurnRadiusArray, name = "Elbow radius array")
+    public double[] getTurnRadiusArray() {
+        return turnRadius;
+    }
+    
+    @RelatedSetValue(Plant3D.URIs.HasTurnRadiusArray)
+    @SetPropertyValue(Plant3D.URIs.HasTurnRadiusArray)
+    public void setTurnRadiusArray(double[] turnRadiusArray) {
+        if (turnRadiusArray == null || turnRadiusArray.length == 0)
+            return;
+        this.turnRadius = turnRadiusArray;
+        firePropertyChanged(Plant3D.URIs.HasTurnRadiusArray);
+    }
        
        @RelatedGetValue(Plant3D.URIs.HasPipeDiameter)
        @GetPropertyValue(value=Plant3D.URIs.HasPipeDiameter, name = "Diameter")
@@ -77,59 +93,66 @@ public class PipeRun extends P3DParentNode<IP3DNode> {
                firePropertyChanged(Plant3D.URIs.HasPipeDiameter);
        }
        
-       @RelatedElementsAdd(Plant3D.URIs.childen)
+       @RelatedElementsAdd(Plant3D.URIs.children)
        public void addChild(PipelineComponent node) {
-               addNode(Plant3D.URIs.childen,node);
+               addNode(Plant3D.URIs.children,node);
        }
        
-       @RelatedElementsGet(Plant3D.URIs.childen)
+       @RelatedElementsGet(Plant3D.URIs.children)
        public Collection<PipelineComponent> getChild() {
                Collection<PipelineComponent> coll = new ArrayList<PipelineComponent>();
-               for (IG3DNode n : getNodes(Plant3D.URIs.childen)) {
+               for (IG3DNode n : getNodes(Plant3D.URIs.children)) {
                        coll.add((PipelineComponent)n);
                }
                return coll;
        }
        
-       @RelatedElementsRem(Plant3D.URIs.childen)
+       @RelatedElementsRem(Plant3D.URIs.children)
        public void remChild(PipelineComponent node) {
-               removeNode(Plant3D.URIs.childen, node);
+               removeNode(Plant3D.URIs.children, node);
        }
 
        
        public List<PipelineComponent> getSortedChild() {
                List<PipelineComponent> coll = new ArrayList<PipelineComponent>();
-               for (IG3DNode n : getNodes(Plant3D.URIs.childen)) {
+               for (IG3DNode n : getNodes(Plant3D.URIs.children)) {
                        coll.add((PipelineComponent)n);
                }
                Collections.sort(coll, new ComponentComparator());
                return coll;
        }
+       private static String PIPECP = "pipecp";
+       
        public void addChild(PipeControlPoint node) {
-               addNode("pipecp",node);
+               addNode(PIPECP,node);
        }
        
        public void remChild(PipeControlPoint node) {
-               removeNode("pipecp", node);
+               removeNode(PIPECP, node);
        }
        
        public void deattachChild(PipeControlPoint node) {
-               deattachNode("pipecp", node);
+               deattachNode(PIPECP, node);
        }
        
        public Collection<PipeControlPoint> getControlPoints() {
                Collection<PipeControlPoint> coll = new ArrayList<PipeControlPoint>();
-               for (IG3DNode n : getNodes("pipecp")) {
+               for (IG3DNode n : getNodes(PIPECP)) {
                        coll.add((PipeControlPoint)n);
                }
                return coll;
        }
        
+       
        public boolean equalSpecs(PipeRun other) {
                if (!MathTools.equals(pipeDiameter,other.pipeDiameter))
                        return false;
-               if (!MathTools.equals(turnRadius,other.turnRadius))
-                       return false;
+               if (turnRadius.length != other.turnRadius.length)
+                   return false;
+               for (int i = 0; i < turnRadius.length; i++) {
+                   if (!MathTools.equals(turnRadius[i],other.turnRadius[i]))
+                       return false;
+               }
                return true;
        }
        
@@ -158,4 +181,5 @@ public class PipeRun extends P3DParentNode<IP3DNode> {
                        
                }
        }
+       
 }