From 9c0ec8f21b0c189de8c5dc2d68e440e62f7206dd Mon Sep 17 00:00:00 2001 From: Reino Ruusu Date: Mon, 20 Apr 2020 12:53:18 +0300 Subject: [PATCH] Take values from pipe run as defaults for reducers gitlab #121 Change-Id: I641b4a0acb69bf3e381afdb6bb1aa22873ea4a79 (cherry picked from commit 5c5214c358806f286aa53f32de57e18568b5f166) --- .../dialog/ComponentSelectionDialog.java | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) 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) { -- 2.45.2