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=2c37521b8367b751451d3a73c5b02cbca60977cd;hb=b93886889422a3111b05a6944b3bcb2cdd8c416a;hp=b762200786217a0434515a068a8d0f89cbe222e6;hpb=43b9a071783377f64924bb0c2f1930fb49316f6f;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 b7622007..2c37521b 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
@@ -48,16 +48,16 @@ import org.simantics.utils.ui.ExceptionUtils;
 
 import vtk.vtkProp;
 
-public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<E>, IMappingListener, RenderListener, NodeListener, UndoRedoSupport.ChangeListener{
+public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VTKNodeMap<DBObject,E>, IMappingListener, RenderListener, NodeListener, UndoRedoSupport.ChangeListener{
 
-	private static final boolean DEBUG = true;
+	private static final boolean DEBUG = false;
 	
 	protected Session session;
-	protected IMapping<Object,E> mapping;
+	protected IMapping<DBObject,E> mapping;
 	protected VtkView view;
 	
-	protected MapList<E, vtkProp> nodeToActor = new MapList<E, vtkProp>();
-	protected Map<vtkProp,E> actorToNode = new HashMap<vtkProp, E>();
+	private MapList<E, vtkProp> nodeToActor = new MapList<E, vtkProp>();
+	private Map<vtkProp,E> actorToNode = new HashMap<vtkProp, E>();
 
 	protected ParentNode<E> rootNode;
 	
@@ -66,7 +66,7 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 	protected int redoOpCount = 0;
 	protected boolean runUndo = false;
 	protected boolean runRedo = false;
-	public AbstractVTKNodeMap(Session session, IMapping<Object,E> mapping, VtkView view, ParentNode<E> rootNode) {
+	public AbstractVTKNodeMap(Session session, IMapping<DBObject,E> mapping, VtkView view, ParentNode<E> rootNode) {
 		this.session = session;
 		this.mapping = mapping;
 		this.view = view;
@@ -85,9 +85,7 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 			e.printStackTrace();
 		}
 	}
-	
-	
-	
+
 	protected abstract void addActor(E node);
 	protected abstract void removeActor(E node);
 	protected abstract void updateActor(E node,Set<String> ids);
@@ -114,6 +112,21 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 		return nodeToActor.getValues((E)node);
 	}
 	
+	protected <T extends vtkProp> void map(E node, Collection<T> props) {
+	    for (vtkProp p : props) {
+	        nodeToActor.add(node, p);
+	        actorToNode.put(p, node);
+	    }
+	}
+	
+	protected void removeMap(E node) {
+	    Collection<vtkProp> coll = nodeToActor.getValuesUnsafe(node);
+	    for (vtkProp p : coll) {
+	        actorToNode.remove(p);
+	    }
+	    nodeToActor.remove(node);
+	}
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public ParentNode<E> getRootNode() {
@@ -143,6 +156,10 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 
 	private boolean rangeModified = false;
 	
+	public boolean isRangeModified() {
+        return rangeModified;
+    }
+	
 	@Override
 	public void onChanged() {
 		try {
@@ -214,7 +231,7 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 			added.add(new Pair<E, String>(node, id));
 			rangeModified = true;
 		}
-		view.refresh();
+		repaint();
 	}
 	
 	@SuppressWarnings("unchecked")
@@ -317,10 +334,11 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 	
 	protected void reset(ReadGraph graph) throws MappingException {
 		if (DEBUG) System.out.println("Reset");
+		
 		synchronized (syncMutex) {
 			graphUpdates = true;
 			mapping.getRangeModified().clear();
-			for (Object o : mapping.getDomain())
+			for (DBObject o : mapping.getDomain())
 				mapping.domainModified(o);
 			mapping.updateRange(graph);
 			graphModified.clear();
@@ -337,7 +355,7 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 		} else {
 			synchronized (syncMutex) {
 				graphUpdates = true;
-				for (Object domainObject : mapping.getDomainModified()) {
+				for (DBObject domainObject : mapping.getDomainModified()) {
 					E rangeObject = mapping.get(domainObject);
 					if (rangeObject != null)
 						graphModified.add(rangeObject);
@@ -389,7 +407,7 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 	
 	/**
 	 * When objects are removed (either from Java or Graph), after remove processing the Java objects remain in mapping cache.
-	 * This causes problems with Undo and Redo, whcih the end up re-using the removed objects from mapping cache.
+	 * This causes problems with Undo and Redo, which cause re-using the removed objects from mapping cache.
 	 * 
 	 * This code here synchronizes removed and added objects to collect deletable objects. (a deletable object is one which is removed but not added).  
 	 * 
@@ -456,7 +474,10 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 	            E n = stack.pop();
 	            boolean conflict = filterChange(removed, n);
 	            if (conflict) {
-	                filterChange(added, n);   
+	                System.out.println("Prevent removing " + n);
+	                //filterChange(added, n)
+	                if (filterChange(added, n))
+	                    System.out.println("Prevent adding " + n);
 	            }
 	            if (n instanceof ParentNode) {
 	                ParentNode<INode> pn = (ParentNode<INode>)n;
@@ -657,7 +678,7 @@ public abstract class AbstractVTKNodeMap<E extends INode> implements VTKNodeMap<
 		
 	}
 	
-	public IMapping<Object,E> getMapping() {
+	public IMapping<DBObject,E> getMapping() {
 		return mapping;
 	}