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=bc7c35528fde4a33f07cc0c5755ecf27e781f1de;hb=e80f56a645f98570ead038096a8963c0c2af4b05;hp=4bcb5df271b53f5c3b8f8651d5146b1096e54540;hpb=ed680aaef733cf82ec30a132611937f24ca3644a;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 4bcb5df2..bc7c3552 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
@@ -11,6 +11,7 @@
  *******************************************************************************/
 package org.simantics.g3d.vtk.common;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,16 +23,18 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Stack;
-import java.util.function.Consumer;
 
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.progress.IProgressService;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Session;
 import org.simantics.db.UndoContext;
 import org.simantics.db.WriteGraph;
-import org.simantics.db.common.request.ReadRequest;
+import org.simantics.db.common.request.UniqueRead;
 import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.util.Layer0Utils;
+import org.simantics.db.procedure.SyncProcedure;
 import org.simantics.db.service.UndoRedoSupport;
 import org.simantics.g3d.ontology.G3D;
 import org.simantics.g3d.scenegraph.RenderListener;
@@ -45,12 +48,16 @@ import org.simantics.utils.datastructures.MapList;
 import org.simantics.utils.datastructures.MapSet;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.ui.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import vtk.vtkProp;
 
 public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VTKNodeMap<DBObject,E>, IMappingListener, RenderListener, NodeListener, UndoRedoSupport.ChangeListener{
 
-	private static final boolean DEBUG = false;
+	private static final boolean DEBUG = true;
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(AbstractVTKNodeMap.class);
 	
 	protected Session session;
 	protected IMapping<DBObject, INode> mapping;
@@ -288,27 +295,29 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 	}
 	
 	protected void doCommit() {
-		session.asyncRequest(new WriteRequest() {
-			
-			@Override
-			public void perform(WriteGraph graph) throws DatabaseException {
-				if (DEBUG) System.out.println("Commit " + commitMessage);
-				if (commitMessage != null) {
-					Layer0Utils.addCommentMetadata(graph, commitMessage);
-					graph.markUndoPoint();
-					commitMessage = null;
+		IProgressService service = PlatformUI.getWorkbench().getProgressService();
+		try {
+			service.busyCursorWhile(monitor -> {
+				try {
+					session.syncRequest(new WriteRequest() {
+						@Override
+						public void perform(WriteGraph graph) throws DatabaseException {
+							if (DEBUG) System.out.println("Commit " + commitMessage);
+							if (commitMessage != null) {
+								Layer0Utils.addCommentMetadata(graph, commitMessage);
+								graph.markUndoPoint();
+								commitMessage = null;
+							}
+							commit(graph);
+						}
+					});
+				} catch (DatabaseException e) {
+					ExceptionUtils.logAndShowError("Cannot commit editor changes", e);
 				}
-				commit(graph);
-			}
-			
-		}, new Consumer<DatabaseException>() {
-			
-			@Override
-			public void accept(DatabaseException parameter) {
-				if (parameter != null)
-					ExceptionUtils.logAndShowError("Cannot commit editor changes", parameter);
-			}
-		});
+			});
+		} catch (InvocationTargetException | InterruptedException e) {
+			LOGGER.error("Unexpected exception", e);
+		}
 	}
 	
 	protected void commit(WriteGraph graph) throws DatabaseException {
@@ -329,38 +338,48 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 		if (graphUpdates)
 			return;
 		if (DEBUG)System.out.println("domainModified");
-		session.asyncRequest(new ReadRequest() {
-			
+		session.asyncRequest(new UniqueRead<Object>() {
+			@Override
+			public Object perform(ReadGraph graph) throws DatabaseException {
+				return new Object();
+			}
+		}, new SyncProcedure<Object>() {
 			@Override
-			public void run(ReadGraph graph) throws DatabaseException {
+			public void execute(ReadGraph graph, Object result) throws DatabaseException {
+				// Perform all updates to the model in a single query thread
 				update(graph);
+			};
+			
+			@Override
+			public void exception(ReadGraph graph, Throwable throwable) throws DatabaseException {
+				LOGGER.error("Failed to update pipeline changes" + throwable);
 			}
 		});
-		
 	}
 	
 	protected void reset(ReadGraph graph) throws MappingException {
 		if (DEBUG) System.out.println("Reset");
 		
-		synchronized (syncMutex) {
-			graphUpdates = true;
-			mapping.getRangeModified().clear();
-			for (DBObject o : mapping.getDomain())
-				mapping.domainModified(o);
-			mapping.updateRange(graph);
-			graphModified.clear();
-			graphUpdates = false;
-		}
+		graphUpdates = true;
+		mapping.getRangeModified().clear();
+		for (DBObject o : mapping.getDomain())
+			mapping.domainModified(o);
+		mapping.updateRange(graph);
+		graphModified.clear();
+		graphUpdates = false;
 	}
 	
 	private boolean useFullSyncWithUndo = false;
 	
 	protected void update(ReadGraph graph) throws DatabaseException {
 		if (DEBUG) System.out.println("Graph update start");
+		
 		if (runUndo && useFullSyncWithUndo) {
-			reset(graph);
+			synchronized (syncMutex) {
+				reset(graph);
+			}
 		} else {
-		    synchronized (syncMutex) {
+			synchronized (syncMutex) {
 				graphUpdates = true;
 				for (DBObject domainObject : mapping.getDomainModified()) {
 					@SuppressWarnings("unchecked")
@@ -368,16 +387,23 @@ public abstract class AbstractVTKNodeMap<DBObject,E extends INode> implements VT
 					if (rangeObject != null)
 						graphModified.add(rangeObject);
 				}
-				mapping.updateRange(graph);
+			
+			}
+			
+			mapping.updateRange(graph);
+			
+			synchronized (syncMutex) {
 				graphModified.clear();
 				syncDeletes();
-				clearDeletes();
-				graphUpdates = false;
-    		}
+			}
+			
+			clearDeletes();
+			graphUpdates = false;
 		}
 		
 		if (mapping.isRangeModified() && !runUndo && !runRedo)
 			commit((String)null);
+		
 		if (DEBUG) System.out.println("Graph update done");
 	}
 	
@@ -420,7 +446,6 @@ 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) {
@@ -442,7 +467,6 @@ 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) {