Fix removed nodes leaving visible graphical elements.

[simantics/3d.git] / org.simantics.g3d.vtk / src / org / simantics / g3d / vtk / common / AbstractVTKNodeMap.java

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java
index 0866dde55e730b6acaa82fd71d9de56abe983e4a..4bcb5df271b53f5c3b8f8651d5146b1096e54540 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/common/AbstractVTKNodeMap.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
+import java.util.function.Consumer;
 
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Session;
@@ -40,7 +41,6 @@ import org.simantics.g3d.scenegraph.base.ParentNode;
 import org.simantics.objmap.exceptions.MappingException;
 import org.simantics.objmap.graph.IMapping;
 import org.simantics.objmap.graph.IMappingListener;
-import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.datastructures.MapList;
 import org.simantics.utils.datastructures.MapSet;
 import org.simantics.utils.datastructures.Pair;
@@ -109,7 +109,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
        @SuppressWarnings("unchecked")
        @Override
        public Collection<vtkProp> getRenderObjects(INode node) {
-               return nodeToActor.getValues((E)node);
+               return nodeToActor.getValues((E) node);
        }
        
        protected <T extends vtkProp> void map(E node, Collection<T> props) {
@@ -121,13 +121,20 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
        
        protected void removeMap(E node) {
            Collection<vtkProp> coll = nodeToActor.getValuesUnsafe(node);
-           for (vtkProp p : coll) {
-               actorToNode.remove(p);
+           if (coll.size() > 0) {
+               view.lock();
+           for (vtkProp p : coll) {
+               actorToNode.remove(p);
+               if (p.GetVTKId() != 0) {
+                    view.getRenderer().RemoveActor(p);
+                    p.Delete();
+                }
+           }
+           view.unlock();
            }
            nodeToActor.remove(node);
        }
        
-       @SuppressWarnings("unchecked")
        @Override
        public ParentNode<E> getRootNode() {
                return (ParentNode<E>)rootNode;
@@ -188,12 +195,11 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                
        }
        
-       @SuppressWarnings("unchecked")
        @Override
        public void updateRenderObjectsFor(E node) {
                List<vtkProp> toDelete = new ArrayList<vtkProp>();
                view.lock();
-               for (vtkProp prop : nodeToActor.getValues((E)node)) {
+               for (vtkProp prop : nodeToActor.getValues(node)) {
                        if (prop.GetVTKId() != 0) {
                                view.getRenderer().RemoveActor(prop);
                                //prop.Delete();
@@ -202,12 +208,12 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                        actorToNode.remove(prop);
                }
                view.unlock();
-               nodeToActor.remove((E)node);
-               Collection<vtkProp> coll = getActors((E)node);
+               nodeToActor.remove(node);
+               Collection<vtkProp> coll = getActors(node);
                if (coll != null) {
                        for (vtkProp prop : coll) {
-                               nodeToActor.add((E)node,prop);
-                               actorToNode.put(prop, (E)node);
+                               nodeToActor.add(node,prop);
+                               actorToNode.put(prop, node);
                                toDelete.remove(prop);
                        }
                }
@@ -253,7 +259,6 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                repaint();
        }
        
-       @SuppressWarnings("unchecked")
        private void receiveUpdate(E node, String id, boolean db) {
                if (DEBUG) System.out.println("receiveUpdate " + debugString(node)  + " " + id + " " + db);
                synchronized (syncMutex) {
@@ -296,10 +301,10 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                                commit(graph);
                        }
                        
-               }, new Callback<DatabaseException>() {
+               }, new Consumer<DatabaseException>() {
                        
                        @Override
-                       public void run(DatabaseException parameter) {
+                       public void accept(DatabaseException parameter) {
                                if (parameter != null)
                                        ExceptionUtils.logAndShowError("Cannot commit editor changes", parameter);
                        }
@@ -326,7 +331,6 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                if (DEBUG)System.out.println("domainModified");
                session.asyncRequest(new ReadRequest() {
                        
-                       @SuppressWarnings("unchecked")
                        @Override
                        public void run(ReadGraph graph) throws DatabaseException {
                                update(graph);
@@ -356,7 +360,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                if (runUndo && useFullSyncWithUndo) {
                        reset(graph);
                } else {
-                       synchronized (syncMutex) {
+                   synchronized (syncMutex) {
                                graphUpdates = true;
                                for (DBObject domainObject : mapping.getDomainModified()) {
                                        @SuppressWarnings("unchecked")
@@ -369,7 +373,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                                syncDeletes();
                                clearDeletes();
                                graphUpdates = false;
-                       }
+               }
                }
                
                if (mapping.isRangeModified() && !runUndo && !runRedo)
@@ -416,6 +420,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
         * This code here synchronizes removed and added objects to collect deletable objects. (a deletable object is one which is removed but not added).  
         * 
         */
+       @SuppressWarnings("unused")
        protected void syncDeletes() {
                deleteUC.clear();
                for (Pair<E, String> n : removed) {
@@ -437,6 +442,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
        /**
         * Clears deletable objects from mapping cache.
         */
+       @SuppressWarnings("unused")
        protected void clearDeletes() {
                if (DEBUG && delete.size() > 0) System.out.println("Delete");
                for (E n : delete) {
@@ -479,10 +485,10 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                    E n = stack.pop();
                    boolean conflict = filterChange(removed, n);
                    if (conflict) {
-                       System.out.println("Prevent removing " + n);
+                       if (DEBUG) System.out.println("Prevent removing " + n);
                        //filterChange(added, n)
                        if (filterChange(added, n))
-                           System.out.println("Prevent adding " + n);
+                          if (DEBUG) System.out.println("Prevent adding " + n);
                    }
                    if (n instanceof ParentNode) {
                        ParentNode<INode> pn = (ParentNode<INode>)n;
@@ -491,7 +497,10 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                        }
                    }
                }
-               
+               // Do not process updates for removed nodes.
+               for (Pair<E, String> r : removed) {
+                   updated.removeValues(r.first);
+               }
                        rem.addAll(removed);
                        add.addAll(added);
                        for (E e : updated.getKeys()) {
@@ -506,16 +515,16 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                }
                
                
-               
                for (Pair<E, String> n : rem) {
                        stopListening(n.first);
                        removeActor(n.first);
+                       n.first.remove();
                }
                
-               for (Pair<E, String> n : add) {
-                       addActor(n.first);
-                       listen(n.first);
-               }
+           for (Pair<E, String> n : add) {
+               addActor(n.first);
+               listen(n.first);
+           }
                
                for (E e : mod.getKeys()) {
                        Set<String> ids = mod.getValues(e);
@@ -549,26 +558,11 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                        }
                }
                
-//      synchronized (syncMutex) {
-//          rem.addAll(removed);
-//          add.addAll(added);
-//          //mod.addAll(updated);
-//          for (E e : updated.getKeys()) {
-//              for (String s : updated.getValues(e))
-//                  mod.add(e, s);
-//          }
-//          
-//          removed.clear();
-//          added.clear();
-//          updated.clear();
-//      }
-               
                for (E e : mod.getKeys()) {
                        Set<String> ids = mod.getValues(e);
                        updateActor(e,ids);
                }
-               
-               
+
                for (Pair<E, String> n : rem) {
                        for (NodeListener l : nodeListeners)
                                l.nodeRemoved(null, n.first, n.second);
@@ -640,7 +634,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
                
                //FIXME : 1. sometimes removed structural models cause ObjMap to add their children again.
                //           removing the listener here prevents corruption of visual model, but better fix is needed.
-               //        2. detach causes nodeRemoved event, which then causes other critical events to be missed. Took out th 
+               //        2. detach causes nodeRemoved event, which then causes other critical events to be missed. Took out call: 
                //stopListening(child);
        }