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=b1d089b80b2db489b2318ed716b60be8188ab890;hp=56a81c49ccf961cbe7badc3be85edf48313bfdfc;hpb=4d7a89228bcee0f588fcceb9821f676b8cf08383;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 56a81c49..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; @@ -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,39 +234,31 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange ExpandBar expandBar = new ExpandBar(composite, SWT.V_SCROLL); - ExpandItem inlineItem = new ExpandItem(expandBar, SWT.NONE); - inlineItem.setText("Inline"); - inlineViewer = new ListViewer(expandBar); - inlineViewer.setLabelProvider(new ComponentLabelProvider()); - inlineViewer.setContentProvider(new ComponentContentProvider()); - - ExpandItem turnItem = new ExpandItem(expandBar, SWT.NONE); - turnItem.setText("Turn"); - turnViewer = new ListViewer(expandBar); - turnViewer.setLabelProvider(new ComponentLabelProvider()); - turnViewer.setContentProvider(new ComponentContentProvider()); - - ExpandItem endItem = new ExpandItem(expandBar, SWT.NONE); - endItem.setText("End"); - endViewer = new ListViewer(expandBar); - endViewer.setLabelProvider(new ComponentLabelProvider()); - endViewer.setContentProvider(new ComponentContentProvider()); - - inlineItem.setControl(inlineViewer.getList()); - turnItem.setControl(turnViewer.getList()); - endItem.setControl(endViewer.getList()); - - inlineViewer.setInput(inlines); - turnViewer.setInput(turns); - endViewer.setInput(ends); - - inlineItem.setHeight(inlineViewer.getList().computeSize(SWT.DEFAULT, SWT.DEFAULT).y); - turnItem.setHeight(turnViewer.getList().computeSize(SWT.DEFAULT, SWT.DEFAULT).y); - endItem.setHeight(endViewer.getList().computeSize(SWT.DEFAULT, SWT.DEFAULT).y); + boolean isOpen = component.getNext() == null || component.getPrevious() == null; + if (!inlines.isEmpty()) { + if (!isOpen) { + // Remove variable length pipe from options + ListIterator it = inlines.listIterator(); + while (it.hasNext()) { + Item item = it.next(); + if (item.isVariable()) + it.remove(); + } + } + + inlineViewer = createItemList(expandBar, inlines, "Inline"); + } - inlineViewer.addSelectionChangedListener(this); - turnViewer.addSelectionChangedListener(this); - endViewer.addSelectionChangedListener(this); + // Only allow elbows and ends to be added to open ends of the pipelines + if (isOpen) { + if (!turns.isEmpty()) { + turnViewer = createItemList(expandBar, turns, "Elbow"); + } + + if (!ends.isEmpty()) { + turnViewer = createItemList(expandBar, ends, "End"); + } + } 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); @@ -324,7 +335,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange label.setText("Wall thickness"); thicknessText = new Text(composite, SWT.SINGLE | SWT.BORDER); label = new Label(composite, SWT.NONE); - label.setText("Turn radius"); + label.setText("Elbow radius"); turnRadiusText = new Text(composite, SWT.SINGLE | SWT.BORDER); validationLabel = new Label(composite, SWT.NONE); @@ -337,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) { @@ -436,6 +449,20 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange return composite; } + private ListViewer createItemList(ExpandBar expandBar, List items, String name) { + ExpandItem expandItem = new ExpandItem(expandBar, SWT.NONE); + expandItem.setText(name); + ListViewer viewer = new ListViewer(expandBar); + viewer.setLabelProvider(new ComponentLabelProvider()); + viewer.setContentProvider(new ComponentContentProvider()); + + expandItem.setControl(viewer.getList()); + viewer.setInput(items); + expandItem.setHeight(viewer.getList().computeSize(SWT.DEFAULT, SWT.DEFAULT).y); + viewer.addSelectionChangedListener(this); + return viewer; + } + private boolean hasInsertPosition() { return component.getNext() == null || component.getPrevious() == null; } @@ -455,15 +482,15 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange Item i = (Item) sel.getFirstElement(); if (i != null) { selected = i; - if (event.getSource() == inlineViewer) { - turnViewer.setSelection(new StructuredSelection()); - endViewer.setSelection(new StructuredSelection()); - } else if (event.getSource() == turnViewer) { - inlineViewer.setSelection(new StructuredSelection()); - endViewer.setSelection(new StructuredSelection()); - } else if (event.getSource() == endViewer) { - inlineViewer.setSelection(new StructuredSelection()); - turnViewer.setSelection(new StructuredSelection()); + if (inlineViewer != null && event.getSource() == inlineViewer) { + clearSelection(turnViewer); + clearSelection(endViewer); + } else if (turnViewer != null && event.getSource() == turnViewer) { + clearSelection(inlineViewer); + clearSelection(endViewer); + } else if (endViewer != null && event.getSource() == endViewer) { + clearSelection(inlineViewer); + clearSelection(turnViewer); } name = generateUniqueName(selected.getName()); @@ -473,6 +500,11 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange } } + private void clearSelection(ListViewer possibleListViewer) { + if (possibleListViewer != null) + possibleListViewer.setSelection(new StructuredSelection()); + } + private void validate() { filterAllowed.clear(); Set filterAllowed = new HashSet(); @@ -624,6 +656,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange } else { turnRadiusText.setEnabled(false); diameterText.setEnabled(false); + thicknessText.setEnabled(false); } if (!selected.isVariable()) {