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;
private static final String DIALOG = "ComponentSelectionDialog"; //$NON-NLS-1$
private IDialogSettings dialogSettings;
+
+ private double lengthFactor = 1.0;
private ResourceManager resourceManager;
// 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;
dialogSettings = settings.getSection(DIALOG);
if (dialogSettings == null)
dialogSettings = settings.addNewSection(DIALOG);
+
+ if (component.getNext() != null && component.getPrevious() != null)
+ insertPosition = PositionType.PREVIOUS;
+ }
+
+ public void setLengthFactor(double lengthFactor) {
+ this.lengthFactor = lengthFactor;
}
@Override
}
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;
}
inlineViewer.setContentProvider(new ComponentContentProvider());
ExpandItem turnItem = new ExpandItem(expandBar, SWT.NONE);
- turnItem.setText("Turn");
+ turnItem.setText("Elbow");
turnViewer = new ListViewer(expandBar);
turnViewer.setLabelProvider(new ComponentLabelProvider());
turnViewer.setContentProvider(new ComponentContentProvider());
horizFillData.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");
label.setText("Diameter");
diameterText = new Text(composite, SWT.SINGLE | SWT.BORDER);
label = new Label(composite, SWT.NONE);
- label.setText("Turn Radius");
+ label.setText("Wall thickness");
+ thicknessText = new Text(composite, SWT.SINGLE | SWT.BORDER);
+ label = new Label(composite, SWT.NONE);
+ label.setText("Elbow radius");
turnRadiusText = new Text(composite, SWT.SINGLE | SWT.BORDER);
+
+ 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);
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(2, 1).align(SWT.END, SWT.END).grab(true, false).applyTo(validationLabel);
if (!allowed.contains(PositionType.NEXT) && !allowed.contains(PositionType.PREVIOUS)) {
turnViewer.getList().setEnabled(false);
return composite;
}
+ 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;
}
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);
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