X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Feditor%2FP3DNodeMap.java;h=10e914de4e142868d099815b958af4cebfd661c3;hb=53d55c24c779745f188bdb18d32f71d20acb61b2;hp=b098951346a114f6b1566ee798a6c20d358d88b1;hpb=a460e609147d064dd3da464bcf1626845e0f93b4;p=simantics%2F3d.git

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 b0989513..10e914de 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/P3DNodeMap.java
@@ -7,14 +7,13 @@ 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.exception.DatabaseException;
 import org.simantics.g3d.ontology.G3D;
 import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.g3d.scenegraph.base.ParentNode;
 import org.simantics.g3d.vtk.common.AbstractVTKNodeMap;
-import org.simantics.g3d.vtk.common.InteractiveVtkPanel;
+import org.simantics.g3d.vtk.common.VtkView;
 import org.simantics.objmap.graph.IMapping;
 import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.IP3DNode;
@@ -25,7 +24,6 @@ import org.simantics.plant3d.scenegraph.ParameterizedNode;
 import org.simantics.plant3d.scenegraph.PipeRun;
 import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint;
 import org.simantics.plant3d.scenegraph.controlpoint.PipingRules;
-import org.simantics.utils.threads.AWTThread;
 
 import vtk.vtkProp;
 import vtk.vtkProp3D;
@@ -34,7 +32,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
 	
 	private static final boolean DEBUG = false;
 
-	public P3DNodeMap(Session session, IMapping mapping, InteractiveVtkPanel panel, P3DRootNode rootNode) {
+	public P3DNodeMap(Session session, IMapping mapping, VtkView panel, P3DRootNode rootNode) {
 		super(session, mapping, panel, rootNode);
 		rootNode.setNodeMap(this);
 	}
@@ -61,7 +59,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
 		}
 		
 		if (ids.contains(Plant3D.URIs.hasGeometry)) {
-			node.visualize(panel);
+			node.visualize(view);
 			updateRenderObjectsFor(node);
 			updateTransform(node);
 		} 
@@ -69,7 +67,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
 			ParameterizedNode geom = (ParameterizedNode)n;
 			for (String id : geom.getParameterMap().keySet()) {
 				if (ids.contains(id)) {
-					node.visualize(panel);
+					node.visualize(view);
 					updateRenderObjectsFor(node);
 					updateTransform(node);
 					break;
@@ -96,7 +94,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
 	private void updateTransform(IP3DNode node) {
 		if (DEBUG) System.out.println("P3DNodeMap update Transform " + node);
 
-		node.update(panel.GetRenderer());
+		node.update(view.getRenderer());
 		
 		if (node instanceof ParentNode<?>) {
 			ParentNode<IP3DNode> p = (ParentNode<IP3DNode>)node;
@@ -141,16 +139,16 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
 		
 		if (hasActor(node))
 			return;
-		if (Thread.currentThread() != AWTThread.getThreadAccess().getThread())
+		if (Thread.currentThread() != view.getThreadQueue().getThread())
 			throw new RuntimeException("Illegal thread.");
 		
-		panel.lock();
+		view.lock();
 		
-		node.visualize(panel);
+		node.visualize(view);
 
 		for (vtkProp3D act : node.getActors()) {
 			nodeToActor.add(node, act);
-            actorToNode.put(act, node);
+			actorToNode.put(act, node);
 		}
 		
 		if (node instanceof P3DParentNode<?>) {
@@ -161,7 +159,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
 		
 		updateTransform(node);
 
-        panel.unlock();
+		view.unlock();
 
 	}
 	
@@ -175,7 +173,7 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
 	}
 	
 	private void remActor(IP3DVisualNode node) {
-		if (Thread.currentThread() != AWTThread.getThreadAccess().getThread())
+		if (Thread.currentThread() != view.getThreadQueue().getThread())
 			throw new RuntimeException("Illegal thread.");
 
 		List<vtkProp> list = nodeToActor.getValues(node);
@@ -184,11 +182,11 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
 				actorToNode.remove(obj);	
 			}
 			nodeToActor.remove(node);
-			panel.lock();
+			view.lock();
 			
 			node.stopVisualize();
 			
-			panel.unlock();
+			view.unlock();
 		}
 	}
 	
@@ -201,10 +199,10 @@ public class P3DNodeMap extends AbstractVTKNodeMap<INode> {
 	}
 	
 	@Override
-	public void commit() {
+	public void commit(String commitMessage) {
 		validate();
 //		System.out.println("Graph commit");
-		super.commit();
+		super.commit(commitMessage);
 		
 	}
 	@Override