X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Factions%2FTranslateFreeVariableLengthAction.java;h=c9bdea171ec8b452571a5d53952bacdc5077db8a;hb=a899aac9dd52296206f302a20a8e7bae2501cf2c;hp=16a388208be3c1713f7c9a0bc813b7e11fcb08a6;hpb=a1e1faa6915445e786f482170576b9c9d0f5d982;p=simantics%2F3d.git diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateFreeVariableLengthAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateFreeVariableLengthAction.java index 16a38820..c9bdea17 100644 --- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateFreeVariableLengthAction.java +++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateFreeVariableLengthAction.java @@ -7,11 +7,10 @@ import javax.vecmath.Vector3d; import org.simantics.g3d.math.Ray; import org.simantics.g3d.scenegraph.IG3DNode; +import org.simantics.g3d.toolbar.ToolComposite; import org.simantics.g3d.vtk.swt.InteractiveVtkComposite; import org.simantics.g3d.vtk.utils.vtkUtil; import org.simantics.plant3d.Activator; -import org.simantics.plant3d.actions.RoutePipeAction.LockType; -import org.simantics.plant3d.actions.RoutePipeAction.ToolState; import org.simantics.plant3d.scenegraph.EndComponent; import org.simantics.plant3d.scenegraph.InlineComponent; import org.simantics.plant3d.scenegraph.Nozzle; @@ -19,16 +18,14 @@ import org.simantics.plant3d.scenegraph.P3DRootNode; import org.simantics.plant3d.scenegraph.PipelineComponent; import org.simantics.plant3d.scenegraph.TurnComponent; import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint; -import org.simantics.plant3d.scenegraph.controlpoint.PipingRules; import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint.Direction; -import org.simantics.plant3d.utils.ComponentUtils; public class TranslateFreeVariableLengthAction extends RoutePipeAction{ private InlineComponent component; - public TranslateFreeVariableLengthAction(InteractiveVtkComposite panel, P3DRootNode root) { - super(panel, root, false); + public TranslateFreeVariableLengthAction(InteractiveVtkComposite panel, P3DRootNode root, ToolComposite toolComposite) { + super(panel, root, toolComposite, false); setText("Translate"); setImageDescriptor(Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/arrow_refresh.png")); } @@ -68,7 +65,7 @@ public class TranslateFreeVariableLengthAction extends RoutePipeAction{ @Override protected void activateNextPrev(PipeControlPoint start) throws Exception { if (!reversed && start.isDualInline()) - start = start.getSubPoint().get(0); + start = start.getDualSub(); else if (reversed && start.isDualSub()) start = start.parent;