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;
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;
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);
}
}
if (ids.contains(Plant3D.URIs.hasGeometry)) {
- node.visualize(panel);
+ node.visualize(view);
updateRenderObjectsFor(node);
updateTransform(node);
}
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;
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;
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<?>) {
updateTransform(node);
- panel.unlock();
+ view.unlock();
}
}
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);
actorToNode.remove(obj);
}
nodeToActor.remove(node);
- panel.lock();
+ view.lock();
node.stopVisualize();
- panel.unlock();
+ view.unlock();
}
}
}
@Override
- public void commit() {
+ public void commit(String commitMessage) {
validate();
// System.out.println("Graph commit");
- super.commit();
+ super.commit(commitMessage);
}
@Override