X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Feditor%2FPlant3DEditor.java;h=d3f3c5e47e11d199b838225ee16f7afa6a0fd4e0;hb=9070983be64f9f107e0a6388549aad475fcd9d76;hp=8387650bb68d5cf7410a53862a2963580d5885bc;hpb=46c28cc32944d0f73c5ab4062bd6b0b232143be7;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
index 8387650b..d3f3c5e4 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/editor/Plant3DEditor.java
@@ -23,6 +23,7 @@ import org.simantics.db.common.request.ReadRequest;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.g3d.scenegraph.IG3DNode;
 import org.simantics.g3d.scenegraph.NodeMap;
+import org.simantics.g3d.scenegraph.RenderListener;
 import org.simantics.g3d.scenegraph.base.INode;
 import org.simantics.g3d.vtk.action.RemoveAction;
 import org.simantics.g3d.vtk.common.HoverHighlighter;
@@ -45,6 +46,7 @@ import org.simantics.plant3d.actions.AddNozzleAction;
 import org.simantics.plant3d.actions.RemoveAndSplitAction;
 import org.simantics.plant3d.actions.RoutePipeAction;
 import org.simantics.plant3d.actions.TranslateInlineAction;
+import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.EndComponent;
 import org.simantics.plant3d.scenegraph.Equipment;
 import org.simantics.plant3d.scenegraph.IP3DNode;
@@ -132,13 +134,13 @@ public class Plant3DEditor extends ResourceEditorPart {
 		
 		new ContextMenuListener(panel, contextMenu);
 		
-		cameraAction = new vtkCameraAndSelectorAction(panel);	
+		cameraAction = createCameraAction();
 		panel.setDefaultAction(cameraAction);
 		panel.useDefaultAction();
 		panel.setPickType(4);
 		
 		try {
-			ControlPointFactory.preloadCache();
+			ControlPointFactory.preloadCache(getLibraryUri());
 			ComponentUtils.preloadCache();
 		} catch (Exception e) {
 			ExceptionUtils.logAndShowError("Cannot open Plant3D editor",e);
@@ -151,19 +153,25 @@ public class Plant3DEditor extends ResourceEditorPart {
 				@SuppressWarnings({ "rawtypes", "unchecked" })
 				@Override
 				public void run(ReadGraph graph) throws DatabaseException {
+				    System.out.println("START PLANT3D LOAD");
 					PipingRules.setEnabled(false);
 					IMappingSchema<Resource, Object> schema = getSchema(graph);
 					mapping = Mappings.createWithListening(schema);
 					rootNode = (P3DRootNode)mapping.map(graph, input);
 					// update control points.
 					// TODO : this should be optimized.
+					
+					
+					
 					try {
-						P3DUtil.finalizeDBLoad(rootNode);
-						
-					} catch (Exception e) {
-						throw new DatabaseException(e);
-					}
-					nodeMap = createNodeMap(getSession(), mapping, panel,rootNode);
+					    P3DUtil.finalizeDBLoad(rootNode);
+					    nodeMap = createNodeMap(getSession(), mapping, panel,rootNode);
+					   
+                    } catch (Exception e) {
+                        throw new DatabaseException(e);
+                    }
+					
+					System.out.println("END PLANT3D LOAD");
 				}
 			});
 			
@@ -171,12 +179,12 @@ public class Plant3DEditor extends ResourceEditorPart {
 				throw new RuntimeException("Scenegraph loading failed.");
 			populate();
 			
-			selectionProvider = new NodeSelectionProvider2<Resource,Object>(this,mapping,nodeMap);
+			selectionProvider = createSelectionProvider();
 
 			cameraAction.addSelectionChangedListener(selectionProvider);
 
-			cameraAction.addHoverChangedListener(new HoverHighlighter(panel,nodeMap));
-			selectionProvider.addSelectionChangedListener(new SelectionHighlighter(panel,nodeMap));
+			cameraAction.addHoverChangedListener(createHoverHighlhighter());
+			selectionProvider.addSelectionChangedListener(createSelectionHighlighter());
 			
 			getSite().setSelectionProvider(selectionProvider);
 			getSite().getPage().addPostSelectionListener(selectionProvider);
@@ -208,6 +216,26 @@ public class Plant3DEditor extends ResourceEditorPart {
 		
 	}
 	
+	protected vtkCameraAndSelectorAction createCameraAction() {
+	    return new vtkCameraAndSelectorAction(panel); 
+	}
+	
+	protected NodeSelectionProvider2<Resource,Object> createSelectionProvider() {
+	    return new NodeSelectionProvider2<Resource,Object>(this,mapping,nodeMap);
+	}
+	
+	protected HoverHighlighter createHoverHighlhighter() {
+	    return new HoverHighlighter(panel,nodeMap);
+	}
+	
+	protected SelectionHighlighter<Resource,INode> createSelectionHighlighter() {
+	    return new SelectionHighlighter<Resource,INode>(panel,nodeMap);
+	}
+	
+	protected String getLibraryUri() {
+	    return Plant3D.URIs.Builtin;
+	}
+	
 	protected void createActions() {
 		translateAction = new TranslateAction(panel,nodeMap);
 		translateInlineAction = new TranslateInlineAction(panel, nodeMap);
@@ -220,7 +248,7 @@ public class Plant3DEditor extends ResourceEditorPart {
 		
 		removeSplitAction = new RemoveAndSplitAction(nodeMap);
 		routePipeAction = new RoutePipeAction(panel,rootNode);
-		addComponentAction = new AddComponentAction(panel, rootNode);
+		addComponentAction = new AddComponentAction(panel, rootNode, getLibraryUri());
 	}
 	
 	public void populate() {
@@ -229,6 +257,27 @@ public class Plant3DEditor extends ResourceEditorPart {
 			@Override
 			public void run() {
 				nodeMap.populate();
+				panel.addListener(new RenderListener() {
+                    
+                    @Override
+                    public void preRender() {
+                   
+                    }
+                    
+                    @Override
+                    public void postRender() {
+                        try {
+                            P3DUtil.finalizeDBLoad2(rootNode);
+                            if (nodeMap.isRangeModified());
+                                nodeMap.commit("Load sync");
+                        } catch (Exception e) {
+                            //throw new DatabaseException(e);
+                        }
+                        panel.removeListener(this);  
+                        
+                    }
+                });
+				
 			}
 		});
 		
@@ -312,7 +361,7 @@ public class Plant3DEditor extends ResourceEditorPart {
 		List<IG3DNode> selected = selectionProvider.getSelectedNodes();
 		try {
 			if (selected.size() == 0) {
-				for (Item eq : P3DUtil.getEquipments()) {
+				for (Item eq : P3DUtil.getEquipments(getLibraryUri())) {
 					m.add(new AddEquipmentAction(rootNode, eq));
 				}
 			} else if (selected.size() == 1) {
@@ -320,7 +369,7 @@ public class Plant3DEditor extends ResourceEditorPart {
 				if (node instanceof Equipment) {
 					m.add(translateAction);
 					m.add(rotateAction);
-					for (Item eq : P3DUtil.getNozzles()) {
+					for (Item eq : P3DUtil.getNozzles(getLibraryUri())) {
 						AddNozzleAction add = new AddNozzleAction(rootNode, eq);
 						add.setEquipment((Equipment)node);
 						m.add(add);
@@ -433,6 +482,10 @@ public class Plant3DEditor extends ResourceEditorPart {
 		return result;
 	}
 	
+	public InteractiveVtkComposite getPanel() {
+        return panel;
+    }
+	
 	public P3DRootNode getRootNode() {
 		return rootNode;
 	}
@@ -440,4 +493,8 @@ public class Plant3DEditor extends ResourceEditorPart {
 	public IMapping<Resource, Object> getMapping() {
 		return mapping;
 	}
+	
+	public P3DNodeMap getNodeMap() {
+        return nodeMap;
+    }
 }