X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fdialog%2FComponentSelectionDialog.java;h=207f929e9cc24c55ab316b3b15faf3124148abf1;hb=refs%2Fchanges%2F26%2F4126%2F1;hp=fc3f0cefc587f16e785a8973bfd2bd0fbc84e931;hpb=473b089069da5d73555c8591ec5ee1112b29c6a2;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..207f929e 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -42,6 +42,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 +140,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;
 	}
@@ -319,6 +337,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) {