X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fdialog%2FComponentSelectionDialog.java;h=2321c1f9941fbd89f2251c6b64b9f89a2ec8efea;hb=76b38316ec8297cbfec6a6759b095aef8cd65931;hp=fc3f0cefc587f16e785a8973bfd2bd0fbc84e931;hpb=f5438b7d35bfb66014369bae22dc3daddbff6498;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 fc3f0cef..2321c1f9 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;
@@ -42,6 +43,7 @@ import org.simantics.plant3d.ontology.Plant3D;
 import org.simantics.plant3d.scenegraph.EndComponent;
 import org.simantics.plant3d.scenegraph.InlineComponent;
 import org.simantics.plant3d.scenegraph.Nozzle;
+import org.simantics.plant3d.scenegraph.PipeRun;
 import org.simantics.plant3d.scenegraph.PipelineComponent;
 import org.simantics.plant3d.scenegraph.TurnComponent;
 import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint.PositionType;
@@ -139,6 +141,23 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 			insertPosition = PositionType.PREVIOUS;
 	}
 	
+	private void copyPipeRunParameters() {
+		PipeRun run = component.getPipeRun();
+		if (component.getNext() == null && component.getAlternativePipeRun() != null)
+			run = component.getAlternativePipeRun();
+		
+		if (run == null)
+			return;
+		
+		diameter = run.getPipeDiameter();
+		thickness = run.getPipeThickness();
+		turnRadius = run.getTurnRadius();
+		
+		diameterText.setText(Double.toString(diameter * lengthFactor));
+		thicknessText.setText(Double.toString(thickness * lengthFactor));
+		turnRadiusText.setText(Double.toString(turnRadius * lengthFactor));
+	}
+
 	public void setLengthFactor(double lengthFactor) {
 		this.lengthFactor = lengthFactor;
 	}
@@ -215,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");
@@ -234,6 +263,12 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).span(2, 1).applyTo(expandBar);
 		GridDataFactory.fillDefaults().grab(true, true).minSize(500, 500).hint(500, 500).applyTo(composite);
 
+		// If there is only one item in the ExpandBar, expand it by default to avoid unnecessary clicks
+		ExpandItem[] expandBarItems = expandBar.getItems();
+		if (expandBarItems.length == 1) {
+			expandBarItems[0].setExpanded(true);
+		}
+
 		Label label = new Label(composite, SWT.NONE);
 		label.setText("Position");
 		Composite buttonComposite = new Composite(composite, SWT.NONE);
@@ -319,6 +354,8 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		diameterText.setEnabled(false);
 		thicknessText.setEnabled(false);
 
+		copyPipeRunParameters();
+
 		nameText.addKeyListener(new KeyAdapter() {
 			@Override
 			public void keyReleased(KeyEvent e) {
@@ -410,8 +447,10 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		GridDataFactory.fillDefaults().span(2, 1).align(SWT.END, SWT.END).grab(true, false).applyTo(validationLabel);
 
 		if (!allowed.contains(PositionType.NEXT) && !allowed.contains(PositionType.PREVIOUS)) {
-			turnViewer.getList().setEnabled(false);
-			endViewer.getList().setEnabled(false);
+			if (turnViewer != null)
+				turnViewer.getList().setEnabled(false);
+			if (endViewer != null)
+				endViewer.getList().setEnabled(false);
 			inlineSplit = true;
 		}
 
@@ -625,6 +664,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 			} else {
 				turnRadiusText.setEnabled(false);
 				diameterText.setEnabled(false);
+				thicknessText.setEnabled(false);
 			}
 
 			if (!selected.isVariable()) {