From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Tue, 10 Mar 2020 14:29:15 +0000 (+0200)
Subject: Allow insertion of components at the ends of straight segments
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F24%2F3924%2F2;p=simantics%2F3d.git

Allow insertion of components at the ends of straight segments

gitlab #106

Change-Id: I20b12339d82ca6da52d9b69ec0f34656c5cb3555
(cherry picked from commit 47a78f85f52d380243f8138a8104f79299c3c86c)
---

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 8dcee926..dae8c629 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
@@ -76,13 +76,13 @@ public class AddComponentAction extends vtkSwtAction {
 				allowed.add(PositionType.NEXT);
 			}  
 		} else {
-			if (component.getNext() == null) {
+			if (component.getNext() == null || component.getControlPoint().isVariableLength()) {
 				allowed.add(PositionType.NEXT);
 			}
-			if (component.getPrevious() == null) {
+			if (component.getPrevious() == null || component.getControlPoint().isVariableLength()) {
 				allowed.add(PositionType.PREVIOUS);
 			}
-			if (component instanceof InlineComponent && !component.getControlPoint().isFixedLength()){
+			if (component instanceof InlineComponent && component.getControlPoint().isVariableLength()){
 				allowed.add(PositionType.SPLIT);
 			}
 		}
diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
index 6bbabe1e..438e0bd6 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/utils/ComponentUtils.java
@@ -499,6 +499,11 @@ public class ComponentUtils {
 		
 		Vector3d v = new Vector3d(dir);
 		if (insertAdjustable) {
+			// Prevent moving of adjacent components - always insert at end of a connected variable length component
+			if (position == PositionType.NEXT && component.getNext() != null ||
+				position == PositionType.PREVIOUS && component.getPrevious() != null)
+				insertPosition = PositionType.PREVIOUS;
+			
 			if (insertPosition == PositionType.NEXT)
 				v.scale(newComponent.getControlPoint().getInlineLength());
 			else if (insertPosition == PositionType.SPLIT)
@@ -525,14 +530,20 @@ public class ComponentUtils {
 		case NEXT: 
 			if (toPcp.isDualInline())
 				toPcp = toPcp.getDualSub();
-			newPcp.insert(toPcp, Direction.NEXT);
 			newPcp.setWorldPosition(pos);
+			if (toPcp.getNext() != null)
+				PipingRules.splitVariableLengthComponent(newComponent, (InlineComponent)component, false);
+			else
+				newPcp.insert(toPcp, Direction.NEXT);
 			break;
 		case PREVIOUS:
 			if (toPcp.isDualSub())
 				toPcp = toPcp.parent;
-			newPcp.insert(toPcp, Direction.PREVIOUS);
 			newPcp.setWorldPosition(pos);
+			if (toPcp.getPrevious() != null)
+				PipingRules.splitVariableLengthComponent(newComponent, (InlineComponent)component, false);
+			else
+				newPcp.insert(toPcp, Direction.PREVIOUS);
 			break;
 		case SPLIT:
 			PipingRules.splitVariableLengthComponent(newComponent, (InlineComponent)component, true);