Allow multiple radii for turns.

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / editor / P3DNodeMap.java

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
index 10e914de4e142868d099815b958af4cebfd661c3..8daee3a530e9286a725bf5b0a113f711fd507f86 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
@@ -7,7 +7,9 @@ import java.util.List;
 import java.util.Set;
 
 import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
 import org.simantics.db.Session;
+import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.g3d.ontology.G3D;
 import org.simantics.g3d.scenegraph.base.INode;
@@ -28,7 +30,7 @@ import org.simantics.plant3d.scenegraph.controlpoint.PipingRules;
 import vtk.vtkProp;
 import vtk.vtkProp3D;
 
-public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
+public class P3DNodeMap extends AbstractVTKNodeMap<Resource,INode> {
        
        private static final boolean DEBUG = false;
 
@@ -38,7 +40,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
        }
        @Override
        protected void updateActor(INode n, Set<String> ids) {
-               if (DEBUG) System.out.println("P3DNodeMap update " + n);
+               if (DEBUG) System.out.println("P3DNodeMap update " + debugString(n));
                if (!(n instanceof IP3DVisualNode)) {
                        if (n instanceof PipeControlPoint) {
                                n = ((PipeControlPoint)n).getPipelineComponent();
@@ -52,7 +54,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                IP3DVisualNode node = (IP3DVisualNode)n;
                
                if (DEBUG) {
-                       System.out.print("P3DNodeMap update " + node);
+                       System.out.print("P3DNodeMap update " + debugString(node));
                        for (String s : ids)
                                System.out.print(" " + s);
                        System.out.println();
@@ -69,7 +71,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                                if (ids.contains(id)) {
                                        node.visualize(view);
                                        updateRenderObjectsFor(node);
-                                       updateTransform(node);
+                                       //updateTransform(node);
                                        break;
                                }
                        }
@@ -81,7 +83,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                        for (PipeControlPoint pcp : run.getControlPoints()) {
                                updateActor(pcp, ids2);
                        }
-               }
+               } 
                
                if (ids.contains(G3D.URIs.hasPosition) || 
                        ids.contains(G3D.URIs.hasOrientation) ||
@@ -89,10 +91,14 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                        ids.contains(G3D.URIs.hasWorldOrientation)) {
                        updateTransform(node);
                }
+               if (ids.contains(Plant3D.URIs.HasTurnRadiusIndex)) {
+                   node.visualize(view);
+                   updateRenderObjectsFor(node);
+               }
        }
        
        private void updateTransform(IP3DNode node) {
-               if (DEBUG) System.out.println("P3DNodeMap update Transform " + node);
+               if (DEBUG) System.out.println("P3DNodeMap update Transform " + debugString(node));
 
                node.update(view.getRenderer());
                
@@ -117,7 +123,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
        
        @Override
        protected void removeActor(INode n) {
-               if (DEBUG) System.out.println("P3DNodeMap.removeActor " + n);
+               if (DEBUG) System.out.println("P3DNodeMap.removeActor " + debugString(n));
                if (!(n instanceof IP3DVisualNode))
                        return;
                IP3DVisualNode node = (IP3DVisualNode)n;
@@ -132,13 +138,15 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
        
        @Override
        protected void addActor(INode n) {
-               if (DEBUG) System.out.println("P3DNodeMap.addActor " + n);
+               if (DEBUG) System.out.println("P3DNodeMap.addActor " + debugString(n));
                if (!(n instanceof IP3DVisualNode))
                        return;
                IP3DVisualNode node = (IP3DVisualNode)n;
                
-               if (hasActor(node))
+               if (hasActor(node)) {
+                   if (DEBUG) System.out.println("Node already has an actor");
                        return;
+               }
                if (Thread.currentThread() != view.getThreadQueue().getThread())
                        throw new RuntimeException("Illegal thread.");
                
@@ -146,10 +154,9 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                
                node.visualize(view);
 
-               for (vtkProp3D act : node.getActors()) {
-                       nodeToActor.add(node, act);
-                       actorToNode.put(act, node);
-               }
+               map(node, node.getActors());
+               
+               if (DEBUG) System.out.println("Added " + node.getActors().size() + " actors");
                
                if (node instanceof P3DParentNode<?>) {
                        for (IP3DNode n2 : ((P3DParentNode<?>)node).getNodes())
@@ -166,7 +173,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
        
        
        private boolean hasActor(IP3DVisualNode node) {
-               List<vtkProp> list = nodeToActor.getValues(node);
+               Collection<vtkProp> list = getRenderObjects(node);
                if (list == null || list.size() == 0)
                        return false;
                return true;
@@ -176,17 +183,12 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                if (Thread.currentThread() != view.getThreadQueue().getThread())
                        throw new RuntimeException("Illegal thread.");
 
-               List<vtkProp> list = nodeToActor.getValues(node);
-               if (list != null) {
-                       for (vtkProp obj : list) {
-                               actorToNode.remove(obj);        
-                       }
-                       nodeToActor.remove(node);
-                       view.lock();
-                       
-                       node.stopVisualize();
-                       
-                       view.unlock();
+               Collection<vtkProp> list = getRenderObjects(node);
+               if (list.size() > 0) {
+                   removeMap(node);
+                   view.lock();
+                   node.stopVisualize();
+                   view.unlock();
                }
        }
        
@@ -205,6 +207,12 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                super.commit(commitMessage);
                
        }
+       
+       @Override
+       protected void commit(WriteGraph graph) throws DatabaseException {
+           super.commit(graph);
+           validateGraph(graph);
+       }
        @Override
        protected void doCommit() {
 //             System.out.println("Do commit");
@@ -240,5 +248,56 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
                }
                
        }
+       
+       protected void validateGraph(ReadGraph graph) throws DatabaseException {
+           Plant3D P3D = Plant3D.getInstance(graph);
+           Resource root = (Resource)mapping.inverseGet(rootNode);
+           if (!graph.isInstanceOf(root, P3D.Plant))
+               throw new DatabaseException("Root is not a Plant");
+           Set<Resource> equipment = new HashSet<>();
+           Set<Resource> pipeRuns = new HashSet<>();
+           for (Resource r : graph.getObjects(root, P3D.children)) {
+               if (graph.isInstanceOf(r, P3D.Equipment)) {
+                   equipment.add(r);
+               } else if (graph.isInstanceOf(r, P3D.PipeRun)) {
+                   pipeRuns.add(r);
+               } else {
+                   throw new DatabaseException("Unknown resource " + r+ " " + mapping.get(r));
+               }
+           }
+           Set<Resource> nozzles = new HashSet<>();
+           for (Resource e : equipment) {
+               for (Resource n : graph.getObjects(e, P3D.HasNozzle)) {
+                   if (graph.isInstanceOf(n, P3D.Nozzle)) {
+                       nozzles.add(n);
+                   } else {
+                       throw new DatabaseException("Unknown nozzle resource " + n+ " " + mapping.get(n));
+                   }
+               }
+           }
+           
+           Set<Resource> components = new HashSet<>();
+        for (Resource run : pipeRuns) {
+            for (Resource c : graph.getObjects(run, P3D.children)) {
+                if (graph.isInstanceOf(c, P3D.PipelineComponent)) {
+                    components.add(c);
+                } else {
+                    throw new DatabaseException("Unknown component resource " + c + " " + mapping.get(c));
+                }
+            }
+        }
+        
+        for (Resource c : components) {
+            for (Resource connected : graph.getObjects(c, P3D.Connects)) {
+                if (!components.contains(connected) && !nozzles.contains(connected)) {
+                    throw new DatabaseException("Unbrowsable component resource " + connected + " " + mapping.get(connected) +" connected to " + c + " " + mapping.get(c));
+                }
+                Collection<Resource> connectedConnected = graph.getObjects(connected, P3D.Connects);
+                if (!connectedConnected.contains(c)) {
+                    throw new DatabaseException("Component resource " + c + " " + mapping.get(c) + " is connected to " + connected + " " + mapping.get(connected) +", but its has no connection back.");
+                }
+            }
+        }
+       }
 
 }