Simplified free ended variable length component update

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / actions / TranslateInlineAction.java

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateInlineAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateInlineAction.java
index 23096f7eabfc96e40568bef31e571ffca5405d7f..7ea42d597b3365ca4b3951fbab2c8b9b47120bfd 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateInlineAction.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateInlineAction.java
@@ -46,9 +46,9 @@ public class TranslateInlineAction extends TranslateAction{
                                        setEnabled(false);
                                        return;
                                }
-                               if (prev.getControlPoint().isInline() && !prev.getControlPoint().isFixed())
+                               if (prev.getControlPoint().isInline() && !prev.getControlPoint().isFixed() && prev.getPrevious() != null)
                                        prev = prev.getPrevious();
-                               if (next.getControlPoint().isInline() && !next.getControlPoint().isFixed()) {
+                               if (next.getControlPoint().isInline() && !next.getControlPoint().isFixed() && next.getNext() != null) {
                                        next = next.getNext();
                                }
                                Point3d ns = new Point3d();
@@ -61,8 +61,14 @@ public class TranslateInlineAction extends TranslateAction{
                                dir.normalize();
                                // We may have offsets in the path leg, hence we have to project the coordinates.
                                Vector3d wp = node.getWorldPosition();
-                               s = MathTools.closestPointOnStraight(pe, wp, dir);
-                               e = MathTools.closestPointOnStraight(ns, wp, dir);
+                               if (prev.getControlPoint().isVariableLength())
+                                   s = MathTools.closestPointOnStraight(ps, wp, dir);
+                               else
+                                   s = MathTools.closestPointOnStraight(pe, wp, dir);
+                               if (next.getControlPoint().isVariableLength())
+                                   e = MathTools.closestPointOnStraight(ne, wp, dir);
+                               else
+                                   e = MathTools.closestPointOnStraight(ns, wp, dir);
                                // Remove component's own space from end points to get actual movement range
                                double l = comp.getControlPoint().getInlineLength();
                                Vector3d ld = new Vector3d(dir);