import org.eclipse.jface.action.IMenuListener;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
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.simantics.g3d.scenegraph.NodeMap;
import org.simantics.g3d.scenegraph.RenderListener;
import org.simantics.g3d.scenegraph.base.INode;
+import org.simantics.g3d.toolbar.ToolComposite;
import org.simantics.g3d.vtk.action.RemoveAction;
import org.simantics.g3d.vtk.common.HoverHighlighter;
import org.simantics.g3d.vtk.common.NodeSelectionProvider2;
public class Plant3DEditor extends ResourceEditorPart {
private Composite parent;
+ protected ToolComposite toolComposite;
private Resource input;
// private InteractiveVtkPanel panel;
// private SWTAWTComponent component;
private InteractiveVtkComposite panel;
+
private P3DRootNode rootNode;
private IMapping<Resource,INode> mapping;
@Override
public void createPartControl(Composite parent) {
this.parent = parent;
- parent.setLayout (new FillLayout ());
+ //parent.setLayout (new FillLayout ());
+
+
// component = new SWTAWTComponent(parent,SWT.NONE) {
//
// @Override
IResourceEditorInput rei = (IResourceEditorInput)getEditorInput();
input = rei.getResource();
+ toolComposite = new ToolComposite(parent, SWT.BORDER);
+ toolComposite.setVisible(true);
+
panel = new InteractiveVtkComposite(parent);
+ GridLayoutFactory.fillDefaults().margins(0, 0).spacing(0, 0).applyTo(parent);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(getPanel().getComponent());
+
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(toolComposite);
+
//IActionBars actionBars = getEditorSite().getActionBars();
hookContextMenu();
@Override
public void run(ReadGraph graph) throws DatabaseException {
- System.out.println("START PLANT3D LOAD");
+ //System.out.println("START PLANT3D LOAD");
PipingRules.setEnabled(false);
IMappingSchema<Resource,INode> schema = getSchema(graph);
mapping = Mappings.createWithListening(schema);
throw new DatabaseException(e);
}
- System.out.println("END PLANT3D LOAD");
+ //System.out.println("END PLANT3D LOAD");
}
});
protected void createActions() {
focusAction = new FocusAction(panel, cameraAction);
- translateAction = new TranslateAction(panel,nodeMap);
- translateInlineAction = new TranslateInlineAction(panel, nodeMap);
- translateFreeVariableLengthAction = new TranslateFreeVariableLengthAction(panel, getRootNode());
- rotateAction = new RotateAction(panel,nodeMap);
+ translateAction = new TranslateAction(panel,nodeMap,toolComposite);
+ translateInlineAction = new TranslateInlineAction(panel, nodeMap,toolComposite);
+ translateFreeVariableLengthAction = new TranslateFreeVariableLengthAction(panel, getRootNode(), toolComposite);
+ rotateAction = new RotateAction(panel,nodeMap,toolComposite);
removeAction = new RemoveAction(nodeMap);
removeSplitAction = new RemoveAndSplitAction(nodeMap);
- routePipeAction = new RoutePipeAction(panel,rootNode);
+ routePipeAction = new RoutePipeAction(panel,rootNode, toolComposite);
addComponentAction = new AddComponentAction(panel, rootNode, getLibraryUri());
reversePipeRunAction = new ReversePipeRunAction(nodeMap);
}
if (nodeMap.isRangeModified());
nodeMap.commit("Load sync");
} catch (Exception e) {
+ ExceptionUtils.logAndShowError("Failed to load model correctly", e);
//throw new DatabaseException(e);
}
panel.removeListener(this);
}
try {
if (selected.size() == 0) {
- for (Item eq : P3DUtil.getEquipments(getLibraryUri())) {
- m.add(new AddEquipmentAction(rootNode, eq));
- }
+ m.add(new AddEquipmentAction(rootNode, getLibraryUri()));
+// for (Item eq : P3DUtil.getEquipments(getLibraryUri())) {
+// m.add(new AddEquipmentAction(rootNode, eq));
+// }
} else if (selected.size() == 1) {
IP3DNode node = (IP3DNode)selected.get(0);
if (node instanceof Equipment) {