X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Factions%2FAddComponentAction.java;h=a4398a5455b582fab3c3192800593c9f921e5c7d;hb=923dc84d6d22c7b80039dd4e07bec088ab78ea33;hp=bf220dd8776dc03959acc6a1410e78771a4adac1;hpb=22bb24d2a7e26c70b0dd4c57080f2c25ac3d40a8;p=simantics%2F3d.git diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java index bf220dd8..a4398a54 100644 --- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java +++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java @@ -2,6 +2,7 @@ package org.simantics.plant3d.actions; import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; +import java.awt.event.MouseWheelEvent; import java.util.HashSet; import java.util.Set; @@ -10,8 +11,8 @@ import javax.vecmath.Vector3d; import org.eclipse.swt.widgets.Display; import org.simantics.g3d.scenegraph.NodeMap; import org.simantics.g3d.scenegraph.base.INode; -import org.simantics.g3d.vtk.action.vtkAction; -import org.simantics.g3d.vtk.common.InteractiveVtkPanel; +import org.simantics.g3d.vtk.swt.InteractiveVtkComposite; +import org.simantics.g3d.vtk.swt.vtkSwtAction; import org.simantics.plant3d.Activator; import org.simantics.plant3d.dialog.ComponentSelectionDialog; import org.simantics.plant3d.gizmo.TerminalSelectionGizmo; @@ -26,13 +27,12 @@ import org.simantics.plant3d.scenegraph.controlpoint.PipingRules; import org.simantics.plant3d.utils.ComponentUtils; import org.simantics.plant3d.utils.Item; import org.simantics.plant3d.utils.Item.Type; -import org.simantics.utils.threads.AWTThread; import org.simantics.utils.threads.ThreadUtils; import org.simantics.utils.ui.ExceptionUtils; import vtk.vtkProp; -public class AddComponentAction extends vtkAction { +public class AddComponentAction extends vtkSwtAction { private P3DRootNode root; @@ -45,7 +45,7 @@ public class AddComponentAction extends vtkAction { private Item toAdd = null; - public AddComponentAction(InteractiveVtkPanel panel, P3DRootNode root) { + public AddComponentAction(InteractiveVtkComposite panel, P3DRootNode root) { super(panel); this.root = root; setText("Add Component"); @@ -90,14 +90,14 @@ public class AddComponentAction extends vtkAction { allowed = dialog.filterAllowed(); gizmo.setComponent(component, allowed); super.run(); - panel.repaint(); + panel.refresh(); } @Override - public void keyPressed(KeyEvent e) { + public boolean keyPressed(KeyEvent e) { if (e.getKeyCode() == KeyEvent.VK_ESCAPE) panel.useDefaultAction(); - + return true; } @@ -106,7 +106,7 @@ public class AddComponentAction extends vtkAction { return; super.attach(); - ThreadUtils.asyncExec(AWTThread.getThreadAccess(), new Runnable() { + ThreadUtils.asyncExec(panel.getThreadQueue(), new Runnable() { public void run() { attachUI(); } @@ -120,12 +120,12 @@ public class AddComponentAction extends vtkAction { nodeMap.commit(); deattachUI(); super.deattach(); - panel.repaint(); + panel.refresh(); } private void attachUI() { //panel.setCursor(activeCursor); - gizmo.attach(panel.GetRenderer()); + gizmo.attach(panel); } private void deattachUI() { @@ -134,23 +134,23 @@ public class AddComponentAction extends vtkAction { } @Override - public void mouseMoved(MouseEvent e) { - panel.getDefaultAction().mouseMoved(e); + public boolean mouseMoved(MouseEvent e) { + return getDefaultAction().mouseMoved(e); } @Override - public void mousePressed(MouseEvent e) { - panel.getDefaultAction().mousePressed(e); + public boolean mousePressed(MouseEvent e) { + return getDefaultAction().mousePressed(e); } @Override - public void mouseReleased(MouseEvent e) { - panel.getDefaultAction().mouseReleased(e); + public boolean mouseReleased(MouseEvent e) { + return getDefaultAction().mouseReleased(e); } @Override - public void mouseDragged(MouseEvent e) { - panel.getDefaultAction().mouseDragged(e); + public boolean mouseDragged(MouseEvent e) { + return getDefaultAction().mouseDragged(e); } public void doInsert(PositionType position) { @@ -159,23 +159,50 @@ public class AddComponentAction extends vtkAction { PipeControlPoint newPcp = newComponent.getControlPoint(); PipeControlPoint toPcp = component.getControlPoint(); - Vector3d start = new Vector3d(); - Vector3d end = new Vector3d(); - Vector3d dir = new Vector3d(); - toPcp.getInlineControlPointEnds(start, end, dir); - dir.normalize(); + PipeRun pipeRun = toPcp.getPipeRun(); - switch (position) { - case NEXT: - if (toPcp.isDualInline()) - toPcp = toPcp.getSubPoint().get(0); - - break; - case PREVIOUS: - if (toPcp.isDualSub()) - toPcp = toPcp.parent; + Vector3d dir = null; + Vector3d pos = null; + + + if (toPcp.isInline()) { + switch (position) { + case NEXT: + if (toPcp.isDualInline()) + toPcp = toPcp.getSubPoint().get(0); + + break; + case PREVIOUS: + if (toPcp.isDualSub()) + toPcp = toPcp.parent; + } + Vector3d start = new Vector3d(); + Vector3d end = new Vector3d(); + dir = new Vector3d(); + toPcp.getInlineControlPointEnds(start, end, dir); + dir.normalize(); + switch (position) { + case NEXT: + pos = new Vector3d(end); + break; + case PREVIOUS: + pos = new Vector3d(start); + break; + case SPLIT: + break; + } + + } else if (toPcp.isDirected()) { + dir = new Vector3d(toPcp.getDirection(Direction.NEXT)); + pos = new Vector3d(toPcp.getWorldPosition()); + } else if (toPcp.isTurn() && toPcp.isFixed()) { + dir = new Vector3d(toPcp.getDirection(position == PositionType.NEXT ? Direction.NEXT : Direction.PREVIOUS)); + pos = new Vector3d(toPcp.getWorldPosition()); + Vector3d v = new Vector3d(dir); + v.scale(toPcp.getInlineLength()); + pos.add(v); } - PipeRun pipeRun = toPcp.getPipeRun(); + if (!toAdd.isSizeChange()) { String name = component.getPipeRun().getUniqueName(toAdd.getName()); @@ -193,29 +220,37 @@ public class AddComponentAction extends vtkAction { } } newComponent.updateParameters(); - - dir.scale(newComponent.getControlPoint().getLength()*0.5); - start.sub(dir); - end.add(dir); + + Vector3d v = new Vector3d(dir); + v.scale(newComponent.getControlPoint().getInlineLength()); + switch (position) { + case NEXT: + pos.add(v); + break; + case PREVIOUS: + pos.sub(v); + break; + case SPLIT: + break; + } + switch (position) { case NEXT: if (toPcp.isDualInline()) toPcp = toPcp.getSubPoint().get(0); newPcp.insert(toPcp, Direction.NEXT); - newPcp.setWorldPosition(end); + newPcp.setWorldPosition(pos); break; case PREVIOUS: if (toPcp.isDualSub()) toPcp = toPcp.parent; newPcp.insert(toPcp, Direction.PREVIOUS); - newPcp.setWorldPosition(start); + newPcp.setWorldPosition(pos); break; case SPLIT: PipingRules.splitVariableLengthComponent(newComponent, (InlineComponent)component, true); } } else { - - PipeRun other = new PipeRun(); String n = root.getUniqueName("PipeRun"); other.setName(n); @@ -224,24 +259,28 @@ public class AddComponentAction extends vtkAction { root.addChild(other); - if (position == PositionType.NEXT) { PipingRules.addSizeChange(false, pipeRun, other, (InlineComponent)newComponent, toPcp, null); - newPcp.setWorldPosition(end); } else if (position == PositionType.PREVIOUS){ PipingRules.addSizeChange(true, pipeRun, other, (InlineComponent)newComponent, toPcp, null); - newPcp.setWorldPosition(start); } + newPcp.setWorldPosition(pos); // TODO : chicken-egg problem newComponent.updateParameters(); - dir.scale(newComponent.getControlPoint().getLength()*0.5); - start.sub(dir); - end.add(dir); - if (position == PositionType.NEXT) { - newPcp.setWorldPosition(end); - } else if (position == PositionType.PREVIOUS){ - newPcp.setWorldPosition(start); - } + Vector3d v = new Vector3d(dir); + v.scale(newComponent.getControlPoint().getLength()*0.5); + switch (position) { + case NEXT: + pos.add(v); + break; + case PREVIOUS: + pos.sub(v); + break; + case SPLIT: + break; + } + newPcp.setWorldPosition(pos); + } @@ -250,19 +289,26 @@ public class AddComponentAction extends vtkAction { } } - public void mouseClicked(MouseEvent e) { + public boolean mouseClicked(MouseEvent e) { if (e.getClickCount() == 1 && e.getButton() == MouseEvent.BUTTON1) { int type = panel.getPickType(); - panel.setPickType(0); + //panel.setPickType(0); + panel.setPickType(5); vtkProp[] picked = panel.pick(e.getX(), e.getY()); panel.setPickType(type); PositionType position = gizmo.getPickedPosition(picked); + if (position != null) { doInsert(position); panel.useDefaultAction(); - return; + return true; } } - panel.getDefaultAction().mouseClicked(e); + return getDefaultAction().mouseClicked(e); + } + + @Override + public boolean mouseWheelMoved(MouseWheelEvent e) { + return getDefaultAction().mouseWheelMoved(e); } }