X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.g3d.vtk%2Fsrc%2Forg%2Fsimantics%2Fg3d%2Fvtk%2Fcommon%2FAbstractVTKNodeMap.java;h=f4458fc34bd47731a2073279cc344d864e8faab3;hb=f346390a5a8cd4262a9aa68951e55d504d412549;hp=2c37521b8367b751451d3a73c5b02cbca60977cd;hpb=b93886889422a3111b05a6944b3bcb2cdd8c416a;p=simantics%2F3d.git

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 2c37521b..f4458fc3 100644
--- 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;
@@ -53,7 +53,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 	private static final boolean DEBUG = false;
 	
 	protected Session session;
-	protected IMapping<DBObject,E> mapping;
+	protected IMapping<DBObject, INode> mapping;
 	protected VtkView view;
 	
 	private MapList<E, vtkProp> nodeToActor = new MapList<E, vtkProp>();
@@ -66,7 +66,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 	protected int redoOpCount = 0;
 	protected boolean runUndo = false;
 	protected boolean runRedo = false;
-	public AbstractVTKNodeMap(Session session, IMapping<DBObject,E> mapping, VtkView view, ParentNode<E> rootNode) {
+	public AbstractVTKNodeMap(Session session, IMapping<DBObject,INode> mapping, VtkView view, ParentNode<E> rootNode) {
 		this.session = session;
 		this.mapping = mapping;
 		this.view = view;
@@ -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);
 			}
 		}
@@ -227,6 +233,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 			}
 			if (changeTracking) {
 				mapping.rangeModified((E)node.getParent());
+				mapping.rangeModified((E)node);
 			}
 			added.add(new Pair<E, String>(node, id));
 			rangeModified = true;
@@ -242,15 +249,16 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 				if (n.first.equals(node))
 					return;
 			}
-			if (changeTracking && !db)
+			if (changeTracking && !db) {
+			    mapping.rangeModified((E)node);
 				mapping.rangeModified((E)node.getParent());
+			}
 			removed.add(new Pair<E, String>(node, id));
 			rangeModified = true;
 		}
 		repaint();
 	}
 	
-	@SuppressWarnings("unchecked")
 	private void receiveUpdate(E node, String id, boolean db) {
 		if (DEBUG) System.out.println("receiveUpdate " + debugString(node)  + " " + id + " " + db);
 		synchronized (syncMutex) {
@@ -293,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);
 			}
@@ -323,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);
@@ -353,10 +360,11 @@ 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()) {
-					E rangeObject = mapping.get(domainObject);
+					@SuppressWarnings("unchecked")
+					E rangeObject = (E) mapping.get(domainObject);
 					if (rangeObject != null)
 						graphModified.add(rangeObject);
 				}
@@ -365,7 +373,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 				syncDeletes();
 				clearDeletes();
 				graphUpdates = false;
-			}
+    		}
 		}
 		
 		if (mapping.isRangeModified() && !runUndo && !runRedo)
@@ -412,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) {
@@ -433,11 +442,13 @@ 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) {
 			if (DEBUG) System.out.println(debugString(n));
 			mapping.getRange().remove(n);
+			stopListening(n);
 		}
 		delete.clear();
 	}
@@ -474,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;
@@ -501,16 +512,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);
@@ -544,26 +555,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);
@@ -623,7 +619,6 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 		if (DEBUG) System.out.println("Node added " + child + " parent " + node);
 		//receiveAdd((E)child, rel ,graphUpdates);
 		receiveAdd((E)child, rel ,graphModified.contains(node));
-		
 	}
 	
 	@SuppressWarnings("unchecked")
@@ -634,9 +629,10 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 		//receiveRemove((E)child, rel, graphUpdates);
 		receiveRemove((E)child, rel, graphModified.contains(node));
 		
-		//FIXME : 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.
-		stopListening(child);
+		//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 call: 
+		//stopListening(child);
 	}
 	
 	@Override
@@ -678,7 +674,7 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 		
 	}
 	
-	public IMapping<DBObject,E> getMapping() {
+	public IMapping<DBObject,INode> getMapping() {
 		return mapping;
 	}