package org.simantics.plant3d.editor;
-import java.awt.Component;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
import org.simantics.db.ReadGraph;
import org.simantics.g3d.scenegraph.NodeMap;
import org.simantics.g3d.scenegraph.base.INode;
import org.simantics.g3d.vtk.action.RemoveAction;
-import org.simantics.g3d.vtk.action.RotateAction;
-import org.simantics.g3d.vtk.action.TranslateAction;
-import org.simantics.g3d.vtk.action.vtkCameraAndSelectorAction;
-import org.simantics.g3d.vtk.common.ContextMenuListener;
import org.simantics.g3d.vtk.common.HoverHighlighter;
-import org.simantics.g3d.vtk.common.InteractiveVtkPanel;
import org.simantics.g3d.vtk.common.NodeSelectionProvider2;
import org.simantics.g3d.vtk.common.SelectionHighlighter;
+import org.simantics.g3d.vtk.common.VtkView;
import org.simantics.g3d.vtk.shape.vtkShape;
+import org.simantics.g3d.vtk.swt.ContextMenuListener;
+import org.simantics.g3d.vtk.swt.InteractiveVtkComposite;
+import org.simantics.g3d.vtk.swt.RotateAction;
+import org.simantics.g3d.vtk.swt.TranslateAction;
+import org.simantics.g3d.vtk.swt.vtkCameraAndSelectorAction;
import org.simantics.g3d.vtk.utils.AxesDisplay;
-import org.simantics.g3d.vtk.utils.vtkPanelUtil;
import org.simantics.objmap.graph.IMapping;
import org.simantics.objmap.graph.Mappings;
import org.simantics.objmap.graph.schema.IMappingSchema;
import org.simantics.plant3d.actions.AddComponentAction;
import org.simantics.plant3d.actions.AddEquipmentAction;
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.scenegraph.EndComponent;
import org.simantics.plant3d.scenegraph.Equipment;
import org.simantics.plant3d.scenegraph.IP3DNode;
import org.simantics.plant3d.scenegraph.InlineComponent;
import org.simantics.plant3d.scenegraph.Nozzle;
import org.simantics.plant3d.scenegraph.P3DRootNode;
-import org.simantics.plant3d.scenegraph.PipeRun;
import org.simantics.plant3d.scenegraph.PipelineComponent;
import org.simantics.plant3d.scenegraph.SchemaBuilder;
import org.simantics.plant3d.scenegraph.TurnComponent;
import org.simantics.plant3d.scenegraph.controlpoint.ControlPointFactory;
-import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint;
import org.simantics.plant3d.scenegraph.controlpoint.PipingRules;
import org.simantics.plant3d.utils.ComponentUtils;
import org.simantics.plant3d.utils.Item;
import org.simantics.ui.workbench.IPropertyPage;
import org.simantics.ui.workbench.IResourceEditorInput;
import org.simantics.ui.workbench.ResourceEditorPart;
-import org.simantics.utils.threads.AWTThread;
import org.simantics.utils.threads.ThreadUtils;
import org.simantics.utils.ui.ExceptionUtils;
-import org.simantics.utils.ui.SWTAWTComponent;
import vtk.vtkActor;
-import vtk.vtkAxesActor;
import vtk.vtkCameraPass;
import vtk.vtkDefaultPass;
import vtk.vtkLightsPass;
-import vtk.vtkOrientationMarkerWidget;
import vtk.vtkRenderPassCollection;
import vtk.vtkRenderer;
import vtk.vtkSequencePass;
private Composite parent;
private Resource input;
- private InteractiveVtkPanel panel;
- private SWTAWTComponent component;
+// private InteractiveVtkPanel panel;
+// private SWTAWTComponent component;
+ private InteractiveVtkComposite panel;
private P3DRootNode rootNode;
private IMapping<Resource,Object> mapping;
private vtkCameraAndSelectorAction cameraAction;
private TranslateAction translateAction;
+ private TranslateInlineAction translateInlineAction;
private RotateAction rotateAction;
private RemoveAction removeAction;
+ private RemoveAndSplitAction removeSplitAction;
private RoutePipeAction routePipeAction;
private AddComponentAction addComponentAction;
public void createPartControl(Composite parent) {
this.parent = parent;
parent.setLayout (new FillLayout ());
- component = new SWTAWTComponent(parent,SWT.NONE) {
-
- @Override
- protected Component createSwingComponent() {
- if (panel == null) {
- panel = new InteractiveVtkPanel();
- vtkPanelUtil.registerPanel(panel);
- createScene();
- }
- return panel;
- }
- };
+// component = new SWTAWTComponent(parent,SWT.NONE) {
+//
+// @Override
+// protected Component createSwingComponent() {
+// if (panel == null) {
+// panel = new InteractiveVtkPanel();
+// vtkPanelUtil.registerPanel(panel);
+// createScene();
+// }
+// return panel;
+// }
+// };
IResourceEditorInput rei = (IResourceEditorInput)getEditorInput();
input = rei.getResource();
+ panel = new InteractiveVtkComposite(parent);
+
//IActionBars actionBars = getEditorSite().getActionBars();
hookContextMenu();
- component.syncPopulate();
+ createScene();
+
+ //component.syncPopulate();
new ContextMenuListener(panel, contextMenu);
- cameraAction = new vtkCameraAndSelectorAction(panel);
+ cameraAction = createCameraAction();
panel.setDefaultAction(cameraAction);
panel.useDefaultAction();
panel.setPickType(4);
// update control points.
// TODO : this should be optimized.
try {
- for (INode node : rootNode.getChild()) {
- if (node instanceof PipeRun) {
- for (PipelineComponent pc : ((PipeRun) node).getChild())
- pc.sync();
- } else if (node instanceof Equipment) {
- for (PipelineComponent pc : ((Equipment) node).getChild())
- pc.sync();
- }
- }
+ P3DUtil.finalizeDBLoad(rootNode);
- for (INode node : rootNode.getChild()) {
- if (node instanceof PipeRun) {
- for (PipelineComponent pc : ((PipeRun) node).getChild())
- pc.sync2();
- } else if (node instanceof Equipment) {
- for (PipelineComponent pc : ((Equipment) node).getChild())
- pc.sync2();
- }
- }
- for (INode node : rootNode.getChild()) {
- if (node instanceof PipeRun) {
- PipingRules.validate((PipeRun)node);
- }
- }
- PipingRules.setEnabled(true);
- for (INode node : rootNode.getChild()) {
- if (node instanceof PipeRun) {
- PipeRun run = (PipeRun)node;
- for (PipeControlPoint pcp : run.getControlPoints())
- PipingRules.positionUpdate(pcp);
-
- }
- }
} catch (Exception e) {
throw new DatabaseException(e);
}
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);
public void widgetDisposed(DisposeEvent e) {
getSite().getPage().removePostSelectionListener(selectionProvider);
- ThreadUtils.asyncExec(AWTThread.getThreadAccess(), new Runnable() {
-
- @Override
- public void run() {
- PipingRules.setEnabled(false);
- nodeMap.delete();
- PipingRules.setEnabled(true);
- vtkPanelUtil.unregisterPanel(panel);
-
- }
- });
+ PipingRules.setEnabled(false);
+ nodeMap.delete();
+ PipingRules.setEnabled(true);
mapping.dispose();
- component.dispose();
-
+// component.dispose();
+ //panel.getComponent().dispose();
}
});
return;
}
+ createActions();
+
+ }
+
+ 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);
rotateAction = new RotateAction(panel,nodeMap);
removeAction = new RemoveAction(nodeMap) {
public void setNode(IG3DNode node) {
super.setNode(node);
-
-
}
};
+
+ removeSplitAction = new RemoveAndSplitAction(nodeMap);
routePipeAction = new RoutePipeAction(panel,rootNode);
addComponentAction = new AddComponentAction(panel, rootNode);
-
}
public void populate() {
- ThreadUtils.asyncExec(AWTThread.getThreadAccess(), new Runnable() {
+ ThreadUtils.asyncExec(panel.getThreadQueue(), new Runnable() {
@Override
public void run() {
return schema;
}
- protected P3DNodeMap createNodeMap(Session session, IMapping<Resource, Object> mapping, InteractiveVtkPanel panel, P3DRootNode rootNode) {
- return new P3DNodeMap(session, mapping, panel,rootNode);
+ protected P3DNodeMap createNodeMap(Session session, IMapping<Resource, Object> mapping, VtkView panel, P3DRootNode rootNode) {
+ return new P3DNodeMap(session, mapping, panel,rootNode);
}
@Override
public void setFocus() {
- component.setFocus();
+ //component.setFocus();
+ panel.getComponent().setFocus();
}
private void createScene() {
- vtkRenderer ren1 = panel.GetRenderer();
+ vtkRenderer ren1 = panel.getRenderer();
boolean multiPass = false;
if (multiPass) {
ren1.SetBackground(0.9,0.9,0.9);
ren1.SetGradientBackground(true);
- // vtkActor grid = vtkShape.createGridActor(8,1.0,1|2|4);
- vtkActor grid = vtkShape.createGridActor(8,1.0, 2 );
- grid.SetPickable(0);
- ren1.AddActor(grid);
- panel.addDeletable(grid);
-
- AxesDisplay axesDisplay = new AxesDisplay(panel);
- axesDisplay.show();
+ // vtkActor grid = vtkShape.createGridActor(8,1.0,1|2|4);
+ vtkActor grid = vtkShape.createGridActor(8,1.0, 2 );
+ grid.SetPickable(0);
+ ren1.AddActor(grid);
+ panel.addDeletable(grid);
+
+ AxesDisplay axesDisplay = new AxesDisplay(panel);
+ axesDisplay.show();
}
protected Menu contextMenu;
protected void hookContextMenu() {
- MenuManager menuMgr = new MenuManager("#PopupMenu");
- menuMgr.setRemoveAllWhenShown(true);
- menuMgr.addMenuListener(new IMenuListener() {
- public void menuAboutToShow(IMenuManager manager) {
- createContextMenu(manager);
- }
- });
+ MenuManager menuMgr = new MenuManager("#PopupMenu");
+ menuMgr.setRemoveAllWhenShown(true);
+ menuMgr.addMenuListener(new IMenuListener() {
+ public void menuAboutToShow(IMenuManager manager) {
+ createContextMenu(manager);
+ }
+ });
- contextMenu = menuMgr.createContextMenu(parent);
- }
+ contextMenu = menuMgr.createContextMenu(parent);
+ }
protected void createContextMenu(IMenuManager m) {
List<IG3DNode> selected = selectionProvider.getSelectedNodes();
add.setEquipment((Equipment)node);
m.add(add);
}
+ m.add(removeAction);
} else if (node instanceof Nozzle) {
- m.add(translateAction);
- m.add(rotateAction);
Nozzle nozzle = (Nozzle)node;
+ if (!nozzle.isFixed()) {
+ m.add(translateAction);
+ m.add(rotateAction);
+ }
m.add(routePipeAction);
routePipeAction.setComponent(nozzle);
routePipeAction.setEnabled(nozzle.getNext() == null && nozzle.getPrevious() == null);
m.add(addComponentAction);
addComponentAction.setComponent(nozzle);
+ m.add(removeAction);
} else if (node instanceof TurnComponent) {
m.add(translateAction);
TurnComponent component = (TurnComponent)node;
routePipeAction.setEnabled(component.getNext() == null || component.getPrevious() == null);
m.add(addComponentAction);
addComponentAction.setComponent(component);
+ m.add(removeAction);
+ m.add(removeSplitAction);
+ removeSplitAction.setNode(node);
} else if (node instanceof EndComponent) {
m.add(translateAction);
m.add(addComponentAction);
addComponentAction.setComponent((PipelineComponent)node);
+ m.add(removeAction);
} else if (node instanceof InlineComponent) {
//m.add(translateInlineAction);
InlineComponent component = (InlineComponent)node;
+ m.add(translateInlineAction);
m.add(routePipeAction);
routePipeAction.setComponent(component);
m.add(addComponentAction);
addComponentAction.setComponent(component);
+ m.add(removeAction);
+ m.add(removeSplitAction);
+ removeSplitAction.setNode(node);
+ } else {
+ m.add(removeAction);
}
- m.add(removeAction);
+
translateAction.setNode(node);
+ translateInlineAction.setNode(node);
rotateAction.setNode(node);
removeAction.setNode(node);
}
} catch (DatabaseException e) {
- ExceptionUtils.logAndShowError(e);
- }
+ ExceptionUtils.logAndShowError(e);
+ }
}
private IContentOutlinePage createOutline() {
if (IMapping.class.equals(adapter)) {
return mapping;
}
- if (InteractiveVtkPanel.class.equals(adapter)) {
+// if (InteractiveVtkPanel.class.equals(adapter)) {
+// return panel;
+// }
+ if (VtkView.class.equals(adapter))
return panel;
- }
if (ISelectionProvider.class.equals(adapter))
return selectionProvider;
return super.getAdapter(adapter);
return result;
}
+ public InteractiveVtkComposite getPanel() {
+ return panel;
+ }
+
public P3DRootNode getRootNode() {
return rootNode;
}
public IMapping<Resource, Object> getMapping() {
return mapping;
}
+
+ public P3DNodeMap getNodeMap() {
+ return nodeMap;
+ }
}
Code Review / simantics / 3d.git / blobdiff