X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fdialog%2FComponentSelectionDialog.java;h=dc00915ff0fda09a98493a9c0b67f9c55b97342a;hb=a7945695983a62d0e1d25a4a1400458f16bcfd70;hp=207f929e9cc24c55ab316b3b15faf3124148abf1;hpb=5c5214c358806f286aa53f32de57e18568b5f166;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
index 207f929e..dc00915f 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -3,6 +3,7 @@ package org.simantics.plant3d.dialog;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Set;
 
 import org.eclipse.jface.dialogs.Dialog;
@@ -233,12 +234,22 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 
 		ExpandBar expandBar = new ExpandBar(composite, SWT.V_SCROLL);
 
+		boolean isOpen = component.getNext() == null || component.getPrevious() == null;
 		if (!inlines.isEmpty()) {
+			if (!isOpen) {
+				// Remove variable length pipe from options
+				ListIterator<Item> it = inlines.listIterator();
+				while (it.hasNext()) {
+					Item item = it.next();
+					if (item.isVariable())
+						it.remove();
+				}
+			}
+			
 			inlineViewer = createItemList(expandBar, inlines, "Inline");
 		}
 
 		// Only allow elbows and ends to be added to open ends of the pipelines
-		boolean isOpen = component.getNext() == null || component.getPrevious() == null;
 		if (isOpen) {
 			if (!turns.isEmpty()) {
 				turnViewer = createItemList(expandBar, turns, "Elbow");
@@ -645,6 +656,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 			} else {
 				turnRadiusText.setEnabled(false);
 				diameterText.setEnabled(false);
+				thicknessText.setEnabled(false);
 			}
 
 			if (!selected.isVariable()) {