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.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.utils.vtkPanelUtil;
+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.objmap.graph.IMapping;
import org.simantics.objmap.graph.Mappings;
import org.simantics.objmap.graph.schema.IMappingSchema;
import org.simantics.plant3d.actions.AddEquipmentAction;
import org.simantics.plant3d.actions.AddNozzleAction;
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.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 RoutePipeAction routePipeAction;
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();
- panel.addMouseListener(new java.awt.event.MouseAdapter() {
- @Override
- public void mouseClicked(final java.awt.event.MouseEvent e) {
- if (e.getButton() == java.awt.event.MouseEvent.BUTTON3) {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- contextMenu.setLocation(e.getXOnScreen(), e.getYOnScreen());
- contextMenu.setVisible(true);
- }
- });
- }
- }
- });
+ new ContextMenuListener(panel, contextMenu);
-
cameraAction = new vtkCameraAndSelectorAction(panel);
panel.setDefaultAction(cameraAction);
panel.useDefaultAction();
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();
}
});
}
translateAction = new TranslateAction(panel,nodeMap);
+ translateInlineAction = new TranslateInlineAction(panel, nodeMap);
rotateAction = new RotateAction(panel,nodeMap);
removeAction = new RemoveAction(nodeMap) {
public void setNode(IG3DNode node) {
}
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) {
+ 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) {
vtkSequencePass seq = new vtkSequencePass();
seq.SetPasses(passes);
-
-
vtkCameraPass cameraPass = new vtkCameraPass();
cameraPass.SetDelegatePass(seq);
ren1.AddActor(grid);
panel.addDeletable(grid);
- {
- vtkAxesActor axes = new vtkAxesActor();
- axes.GetXAxisCaptionActor2D().GetCaptionTextProperty().SetColor(0,0,0);
- axes.GetYAxisCaptionActor2D().GetCaptionTextProperty().SetColor(0,0,0);
- axes.GetZAxisCaptionActor2D().GetCaptionTextProperty().SetColor(0,0,0);
- axes.GetXAxisCaptionActor2D().GetCaptionTextProperty().SetShadow(0);
- axes.GetYAxisCaptionActor2D().GetCaptionTextProperty().SetShadow(0);
- axes.GetZAxisCaptionActor2D().GetCaptionTextProperty().SetShadow(0);
- axes.GetXAxisCaptionActor2D().GetCaptionTextProperty().ItalicOff();
- axes.GetYAxisCaptionActor2D().GetCaptionTextProperty().ItalicOff();
- axes.GetZAxisCaptionActor2D().GetCaptionTextProperty().ItalicOff();
- axes.GetXAxisCaptionActor2D().GetCaptionTextProperty().Delete();
- axes.GetYAxisCaptionActor2D().GetCaptionTextProperty().Delete();
- axes.GetZAxisCaptionActor2D().GetCaptionTextProperty().Delete();
- axes.GetXAxisCaptionActor2D().Delete();
- axes.GetYAxisCaptionActor2D().Delete();
- axes.GetZAxisCaptionActor2D().Delete();
- vtkOrientationMarkerWidget widget = new vtkOrientationMarkerWidget();
- widget.SetOutlineColor(0.9300, 0.5700, 0.1300 );
- widget.SetOrientationMarker(axes);
- widget.SetInteractor(panel.getRenderWindowInteractor());
- //widget.SetViewport(0.8, 0.0, 1.0, 0.2); // bottom right
- //widget.SetViewport(0.0, 0.0, 0.4, 0.4);
- widget.SetViewport(0.0, 0.0, 0.2, 0.2); // bottom left
- widget.SetEnabled(1);
- widget.InteractiveOff();
- }
-
+ AxesDisplay axesDisplay = new AxesDisplay(panel);
+ axesDisplay.show();
}
} else if (node instanceof InlineComponent) {
//m.add(translateInlineAction);
InlineComponent component = (InlineComponent)node;
+ m.add(translateInlineAction);
m.add(routePipeAction);
routePipeAction.setComponent(component);
m.add(addComponentAction);
m.add(removeAction);
translateAction.setNode(node);
+ translateInlineAction.setNode(node);
rotateAction.setNode(node);
removeAction.setNode(node);
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);
Code Review / simantics / 3d.git / blobdiff