Data corruption on editor startup.

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / editor / Plant3DEditor.java

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 8387650bb68d5cf7410a53862a2963580d5885bc..2c94b5daea3fa4d191f7dda53dbc7960f350063d 100644 (file)
--- 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;
@@ -132,7 +133,7 @@ public class Plant3DEditor extends ResourceEditorPart {
                
                new ContextMenuListener(panel, contextMenu);
                
-               cameraAction = new vtkCameraAndSelectorAction(panel);   
+               cameraAction = createCameraAction();
                panel.setDefaultAction(cameraAction);
                panel.useDefaultAction();
                panel.setPickType(4);
@@ -151,19 +152,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 +178,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 +215,22 @@ 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<INode> createSelectionHighlighter() {
+           return new SelectionHighlighter<INode>(panel,nodeMap);
+       }
+       
        protected void createActions() {
                translateAction = new TranslateAction(panel,nodeMap);
                translateInlineAction = new TranslateInlineAction(panel, nodeMap);
@@ -229,6 +252,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);  
+                        
+                    }
+                });
+                               
                        }
                });
                
@@ -433,6 +477,10 @@ public class Plant3DEditor extends ResourceEditorPart {
                return result;
        }
        
+       public InteractiveVtkComposite getPanel() {
+        return panel;
+    }
+       
        public P3DRootNode getRootNode() {
                return rootNode;
        }
@@ -440,4 +488,8 @@ public class Plant3DEditor extends ResourceEditorPart {
        public IMapping<Resource, Object> getMapping() {
                return mapping;
        }
+       
+       public P3DNodeMap getNodeMap() {
+        return nodeMap;
+    }
 }