X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Factions%2FTranslateFreeVariableLengthAction.java;h=b76989e1caace5bd31aa5e9e878e714dd7eea616;hb=1ca09aa9bae3ea1e3382ceff0a2a09427f173286;hp=e693f1fb2163a6658e6ac86c1f93c9f453c6b278;hpb=4ba0c31ec2e71a3ed612c012a7f35bd5342a833b;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 e693f1fb..b76989e1 100644 --- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateFreeVariableLengthAction.java +++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateFreeVariableLengthAction.java @@ -10,8 +10,6 @@ import org.simantics.g3d.scenegraph.IG3DNode; 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,9 +17,7 @@ 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{ @@ -68,7 +64,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; @@ -108,7 +104,7 @@ public class TranslateFreeVariableLengthAction extends RoutePipeAction{ start.getControlPointEnds(previousPosition,v); } } else if (startComponent instanceof TurnComponent) { - if (start.isFixed()) { + if (start.asFixedAngle()) { direction = startComponent.getControlPoint().getPathLegDirection(reversed ? Direction.PREVIOUS : Direction.NEXT); lock = LockType.CUSTOM; } else {