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;
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;
private IDialogSettings dialogSettings;
private double lengthFactor = 1.0;
+ private String lengthUnit = "m";
private ResourceManager resourceManager;
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;
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);
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");
}
}
- 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);
+ 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);
+
+ // 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");
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);
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(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("");
diameterText.setEnabled(false);
thicknessText.setEnabled(false);
+ copyPipeRunParameters();
+
nameText.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
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;
}
} else {
turnRadiusText.setEnabled(false);
diameterText.setEnabled(false);
+ thicknessText.setEnabled(false);
}
if (!selected.isVariable()) {