import org.simantics.databoard.Bindings;
import org.simantics.db.ReadGraph;
import org.simantics.db.Resource;
+import org.simantics.db.Session;
import org.simantics.db.common.ResourceArray;
import org.simantics.db.common.primitiverequest.PossibleAdapter;
import org.simantics.db.exception.DatabaseException;
import org.simantics.db.exception.ManyObjectsForFunctionalRelationException;
import org.simantics.db.exception.NoSingleResultException;
import org.simantics.db.exception.ServiceException;
+import org.simantics.db.layer0.variable.Variable;
import org.simantics.db.management.ISessionContext;
import org.simantics.db.request.Read;
import org.simantics.diagram.adapter.DefaultConnectionClassFactory;
import org.simantics.g2d.participant.TransformUtil;
import org.simantics.g2d.participant.ZoomToAreaHandler;
import org.simantics.g2d.scenegraph.ICanvasSceneGraphProvider;
+import org.simantics.g2d.scenegraph.ICanvasSceneGraphProvider2;
import org.simantics.modeling.ModelingResources;
import org.simantics.modeling.mapping.ComponentCopyAdvisor;
import org.simantics.modeling.mapping.ElementCopyAdvisor;
* @author J-P Laine
*
*/
-public class DiagramSceneGraphProvider implements ICanvasSceneGraphProvider, IDiagramUpdateSupport {
+public class DiagramSceneGraphProvider implements ICanvasSceneGraphProvider2, IDiagramUpdateSupport {
protected boolean isSymbol = false;
protected Resource resource;
@Override
public G2DSceneGraph initializeSceneGraph(ICanvasContext context, String modelURI, String RVI) {
G2DSceneGraph sg = context.getSceneGraph();
- return initializeSceneGraph(context, sg, modelURI, RVI, "");
+ return initializeSceneGraph(context, sg, modelURI, RVI, "", null);
}
+
+
+ @Override
+ public G2DSceneGraph initializeSceneGraph(ICanvasContext context, String modelURI, String RVI,
+ Variable experiment) {
+ G2DSceneGraph sg = context.getSceneGraph();
+ return initializeSceneGraph(context, sg, modelURI, RVI, "", experiment);
+ }
+
/**
* @param sg
private G2DSceneGraph initializeSceneGraph(G2DSceneGraph sg, String modelURI, String RVI, String view) {
IThreadWorkQueue thread = AWTThread.getThreadAccess();
ctx = new CanvasContext(thread, sg); // By giving the scene graph instance as parameter, we can use external serializer
- return initializeSceneGraph(ctx, sg, modelURI, RVI, view);
+ return initializeSceneGraph(ctx, sg, modelURI, RVI, view, null);
}
protected GraphToDiagramSynchronizer createSynchronizer(ReadGraph graph) throws DatabaseException {
)
);
}
+
+ protected RuntimeDiagramManager createRuntimeDiagramManager(Session session, Resource resource, String modelURI, String RVI, Variable experiment) throws DatabaseException {
+ return RuntimeDiagramManager.create(session, resource, modelURI, RVI);
+ }
/**
* @param sg
* @param initialHints
* @return
*/
- private G2DSceneGraph initializeSceneGraph(ICanvasContext context, G2DSceneGraph sg, String modelURI, String RVI, String view) {
+ private G2DSceneGraph initializeSceneGraph(ICanvasContext context, G2DSceneGraph sg, String modelURI, String RVI, String view, Variable run) {
this.ctx = (CanvasContext) context;
this.view = view;
if(view != null) {
initialHints.setHint(SynchronizationHints.COPY_ADVISOR, getCopyAdvisor());
- final RuntimeDiagramManager runtimeDiagramManager = RuntimeDiagramManager.create(Simantics.getSession(), resource, modelURI, RVI);
+ final RuntimeDiagramManager runtimeDiagramManager = createRuntimeDiagramManager(Simantics.getSession(), resource, modelURI, RVI, run);
synchronizer = Simantics.getSession().syncRequest(new Read<GraphToDiagramSynchronizer>() {
@Override