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.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
+import org.simantics.Simantics;
+import org.simantics.db.Session;
import org.simantics.db.exception.DatabaseException;
import org.simantics.plant3d.Activator;
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;
public class ComponentSelectionDialog extends Dialog implements ISelectionChangedListener {
+ private static final String DIALOG = "ComponentSelectionDialog"; //$NON-NLS-1$
+
+ private IDialogSettings dialogSettings;
+
+ private double lengthFactor = 1.0;
+ private String lengthUnit = "m";
+
private ResourceManager resourceManager;
private String libUri;
private Text lengthText;
// Turn component
private Text angleText;
- // Rotated In-line, or turn conponent.
+ // Rotated In-line, or turn component.
private Text rotationAngleText;
// Input for new PipeRun
private Double diameter;
+ private Double thickness;
private Double turnRadius;
private Text diameterText;
+ private Text thicknessText;
private Text turnRadiusText;
+
+ // Validation message label
+ private Label validationLabel;
// Position selection
private Button startButton;
this.libUri = libUri;
usedNames = new HashSet<>();
+
+ setShellStyle(getShellStyle() | SWT.RESIZE);
+
+ IDialogSettings settings = Activator.getDefault().getDialogSettings();
+ dialogSettings = settings.getSection(DIALOG);
+ if (dialogSettings == null)
+ dialogSettings = settings.addNewSection(DIALOG);
+
+ if (component.getNext() != null && component.getPrevious() != null)
+ 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;
+ }
+
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
}
protected List<Item> getItems(Class<?> c, String libUri) throws DatabaseException {
+ Session session = Simantics.getSession();
if (InlineComponent.class.equals(c)) {
- return P3DUtil.getInlines(libUri);
+ return P3DUtil.getInlines(session, libUri);
} else if (TurnComponent.class.equals(c)) {
- return P3DUtil.getTurns(libUri);
+ return P3DUtil.getTurns(session, libUri);
} else if (EndComponent.class.equals(c)) {
- return P3DUtil.getEnds(libUri);
+ return P3DUtil.getEnds(session, libUri);
} else {
return null;
}
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);
turns = P3DUtil.filterUserComponents(turns);
inlines = P3DUtil.filterUserComponents(inlines);
- ExpandBar expandBar = new ExpandBar(composite, SWT.NONE);
-
- 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);
+ 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");
+ }
- 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().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");
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);
+ middleButton.setSelection(insertPosition == PositionType.SPLIT);
+ endButton.setSelection(insertPosition == PositionType.NEXT);
+
startButton.setEnabled(false);
middleButton.setEnabled(false);
endButton.setEnabled(false);
updateInsertPosition(PositionType.NEXT);
}
});
- endButton.setSelection(true);
+
+ 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("Turn Radius");
+ 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("");
lengthText.setEnabled(false);
angleText.setEnabled(false);
rotationAngleText.setEnabled(false);
turnRadiusText.setEnabled(false);
diameterText.setEnabled(false);
+ thicknessText.setEnabled(false);
+
+ copyPipeRunParameters();
nameText.addKeyListener(new KeyAdapter() {
@Override
@Override
public void keyReleased(KeyEvent e) {
try {
- length = Double.parseDouble(lengthText.getText());
+ length = Double.parseDouble(lengthText.getText()) / lengthFactor;
} catch (NumberFormatException err) {
length = null;
}
@Override
public void keyReleased(KeyEvent e) {
try {
- diameter = Double.parseDouble(diameterText.getText());
+ diameter = Double.parseDouble(diameterText.getText()) / lengthFactor;
} catch (NumberFormatException err) {
diameter = null;
}
validate();
}
});
+
+ thicknessText.addKeyListener(new KeyAdapter() {
+ @Override
+ public void keyReleased(KeyEvent e) {
+ try {
+ thickness = Double.parseDouble(thicknessText.getText()) / lengthFactor;
+ } catch (NumberFormatException err) {
+ thickness = null;
+ }
+ validate();
+ }
+ });
turnRadiusText.addKeyListener(new KeyAdapter() {
@Override
public void keyReleased(KeyEvent e) {
try {
- turnRadius = Double.parseDouble(turnRadiusText.getText());
+ turnRadius = Double.parseDouble(turnRadiusText.getText()) / lengthFactor;
} catch (NumberFormatException err) {
turnRadius = null;
}
horizFillData.applyTo(angleText);
horizFillData.applyTo(rotationAngleText);
horizFillData.applyTo(diameterText);
+ horizFillData.applyTo(thicknessText);
horizFillData.applyTo(turnRadiusText);
+
+ 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<Item> 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;
- endButton.setSelection(type == PositionType.NEXT);
- middleButton.setSelection(type == PositionType.SPLIT);
startButton.setSelection(type == PositionType.PREVIOUS);
+ middleButton.setSelection(type == PositionType.SPLIT);
+ endButton.setSelection(type == PositionType.NEXT);
insertPosition = type;
}
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());
}
}
+ private void clearSelection(ListViewer possibleListViewer) {
+ if (possibleListViewer != null)
+ possibleListViewer.setSelection(new StructuredSelection());
+ }
+
private void validate() {
filterAllowed.clear();
Set<PositionType> filterAllowed = new HashSet<PositionType>();
boolean ok = true;
+ String msg = null;
+
+ if (name.isEmpty() || usedNames.contains(name)) {
+ ok = false;
+ if (msg == null) {
+ if (name.isEmpty())
+ msg = "Please provide a valid name";
+ else
+ msg = "Name \"" + name + "\" is already in use";
+ }
+ }
+
if (selected == null) {
ok = false;
} else if (selected.isCode()) {// TODO : instead of disabling the button, we should filter the content.
} else {
lenghtAdjustable = ((selected.getType() == Type.INLINE)
&& (selected.isVariable() || selected.isModifiable()));
- if (insertAdjustable) {
+
+ if (!hasInsertPosition()) {
+ // We are inserting to a fully connected variable length component
+ // only allow insertion within the component
+ startButton.setEnabled(false);
+ middleButton.setEnabled(false);
+ endButton.setEnabled(false);
+ updateInsertPosition(PositionType.PREVIOUS);
+ } else if (insertAdjustable) {
switch (selected.getType()) {
case END:
startButton.setEnabled(false);
angleText.setEnabled(false);
rotationAngleText.setEnabled(selected.isRotated());
ok = false;
-
+ if (msg == null) msg = "Cannot split a straight pipe with a straight pipe";
} else {
lengthText.setEnabled(true);
angleText.setEnabled(false);
rotationAngleText.setEnabled(selected.isRotated());
- if (length == null)
+ if (length == null || length <= 0.0) {
ok = false;
+ if (msg == null) msg = "Please provide a valid length";
+ }
}
} else if (selected.getType() == Type.TURN) {
filterAllowed.add(PositionType.NEXT);
lengthText.setEnabled(false);
angleText.setEnabled(true);
rotationAngleText.setEnabled(true);
- if (angle == null)
+ if (angle == null) {
ok = false;
+ if (msg == null) msg = "Please provide a turn angle";
+ }
} else {
// this should not happen, since end components should not have variable, or
// modifiable flag.
if (selected.isSizeChange()) {
turnRadiusText.setEnabled(true);
diameterText.setEnabled(true);
- if (diameter == null || turnRadius == null)
+ thicknessText.setEnabled(true);
+ if (diameter == null || diameter <= 0.0) {
ok = false;
+ if (msg == null) msg = "Please provide a valid diameter";
+ }
+ if (turnRadius == null || diameter != null && turnRadius < diameter / 2) {
+ ok = false;
+ if (msg == null) msg = "Please provide a valid turn radius";
+ }
+ if (thickness == null || thickness < 0.0 || diameter != null && thickness >= diameter / 2) {
+ ok = false;
+ if (msg == null) msg = "Please provide a valid wall thickness";
+ }
} else {
turnRadiusText.setEnabled(false);
diameterText.setEnabled(false);
+ thicknessText.setEnabled(false);
}
if (!selected.isVariable()) {
this.filterAllowed.add(t);
}
- if (name.isEmpty() || usedNames.contains(name))
- ok = false;
+ validationLabel.setText(msg != null ? msg : "");
+ validationLabel.requestLayout();
getButton(OK).setEnabled(ok);
}
return lenghtAdjustable;
}
+ public Double getThickness() {
+ return thickness;
+ }
+
}
Code Review / simantics / 3d.git / blobdiff