No insertion of straight pipe in straight pipe

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / dialog / ComponentSelectionDialog.java

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 fc3f0cefc587f16e785a8973bfd2bd0fbc84e931..dc00915ff0fda09a98493a9c0b67f9c55b97342a 100644 (file)
--- 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");
@@ -319,6 +348,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) {
@@ -625,6 +656,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                        } else {
                                turnRadiusText.setEnabled(false);
                                diameterText.setEnabled(false);
+                               thicknessText.setEnabled(false);
                        }
 
                        if (!selected.isVariable()) {