X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fdialog%2FComponentSelectionDialog.java;h=3cfe2a94c664d39558387b4b51a3824955d41956;hb=refs%2Fchanges%2F87%2F4287%2F1;hp=df00bc39f468804efcde3b91afa6d133087c1000;hpb=c66db4cc6b57647163cfb15db250525ff8e0e882;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 df00bc39..3cfe2a94 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; @@ -57,6 +59,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange private IDialogSettings dialogSettings; private double lengthFactor = 1.0; + private String lengthUnit = "m"; private ResourceManager resourceManager; @@ -139,10 +142,31 @@ 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; } + public void setLengthUnit(String lengthUnit) { + this.lengthUnit = lengthUnit; + } + @Override protected IDialogSettings getDialogBoundsSettings() { return dialogSettings; @@ -176,7 +200,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange resourceManager = new LocalResourceManager(JFaceResources.getResources(), parent); Composite composite = new Composite(parent, SWT.NONE); - GridLayout layout = new GridLayout(2, false); + GridLayout layout = new GridLayout(3, false); layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN); layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN); layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING); @@ -215,42 +239,40 @@ 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); + 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"); + } - 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); + // 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"); + } + } - inlineViewer.addSelectionChangedListener(this); - turnViewer.addSelectionChangedListener(this); - endViewer.addSelectionChangedListener(this); + GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).span(3, 1).applyTo(expandBar); + GridDataFactory.fillDefaults().grab(true, true).minSize(300, 500).hint(300, 500).applyTo(composite); - 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"); @@ -267,7 +289,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange startButton.setToolTipText("Overlapping insert"); middleButton.setToolTipText("Cutting insert"); endButton.setToolTipText("Adding insert"); - horizFillData.applyTo(buttonComposite); + horizFillData.copy().span(2, 1).applyTo(buttonComposite); GridLayoutFactory.fillDefaults().numColumns(3).applyTo(buttonComposite); startButton.setSelection(insertPosition == PositionType.PREVIOUS); @@ -297,30 +319,53 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange updateInsertPosition(PositionType.NEXT); } }); + + if (!hasInsertPosition()) { + label.setVisible(false); + buttonComposite.setVisible(false); + } label = new Label(composite, SWT.NONE); label.setText("Name"); nameText = new Text(composite, SWT.SINGLE | SWT.BORDER); + label = new Label(composite, SWT.NONE); + label.setText(""); label = new Label(composite, SWT.NONE); label.setText("Length"); lengthText = new Text(composite, SWT.SINGLE | SWT.BORDER); + label = new Label(composite, SWT.NONE); + label.setText(lengthUnit); + label = new Label(composite, SWT.NONE); label.setText("Angle"); angleText = new Text(composite, SWT.SINGLE | SWT.BORDER); + label = new Label(composite, SWT.NONE); + label.setText("\u00b0"); + label = new Label(composite, SWT.NONE); label.setText("Rotation angle"); rotationAngleText = new Text(composite, SWT.SINGLE | SWT.BORDER); + label = new Label(composite, SWT.NONE); + label.setText("\u00b0"); label = new Label(composite, SWT.NONE); label.setText("Diameter"); diameterText = new Text(composite, SWT.SINGLE | SWT.BORDER); + label = new Label(composite, SWT.NONE); + label.setText(lengthUnit); + label = new Label(composite, SWT.NONE); label.setText("Wall thickness"); thicknessText = new Text(composite, SWT.SINGLE | SWT.BORDER); label = new Label(composite, SWT.NONE); - label.setText("Turn radius"); + label.setText(lengthUnit); + + label = new Label(composite, SWT.NONE); + label.setText("Elbow radius"); turnRadiusText = new Text(composite, SWT.SINGLE | SWT.BORDER); + label = new Label(composite, SWT.NONE); + label.setText(lengthUnit); validationLabel = new Label(composite, SWT.NONE); validationLabel.setText(""); @@ -332,6 +377,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) { @@ -420,17 +467,37 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange horizFillData.applyTo(thicknessText); horizFillData.applyTo(turnRadiusText); - GridDataFactory.fillDefaults().span(2, 1).align(SWT.END, SWT.END).grab(true, false).applyTo(validationLabel); + GridDataFactory.fillDefaults().span(3, 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; } 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; + } + private void updateInsertPosition(PositionType type) { if (insertPosition == type) return; @@ -446,15 +513,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()); @@ -464,6 +531,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(); @@ -488,7 +560,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange lenghtAdjustable = ((selected.getType() == Type.INLINE) && (selected.isVariable() || selected.isModifiable())); - if (component.getNext() != null && component.getPrevious() != null) { + if (!hasInsertPosition()) { // We are inserting to a fully connected variable length component // only allow insertion within the component startButton.setEnabled(false); @@ -615,6 +687,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange } else { turnRadiusText.setEnabled(false); diameterText.setEnabled(false); + thicknessText.setEnabled(false); } if (!selected.isVariable()) {