X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fdialog%2FComponentSelectionDialog.java;h=df00bc39f468804efcde3b91afa6d133087c1000;hb=c66db4cc6b57647163cfb15db250525ff8e0e882;hp=720d88cec826729ba748870ace5a4acb7472b02a;hpb=24771e19204e33f6701321f63f57a751e022197a;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 720d88ce..df00bc39 100644 --- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java +++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java @@ -34,6 +34,8 @@ import org.eclipse.swt.widgets.ExpandItem; 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; @@ -53,6 +55,8 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange private static final String DIALOG = "ComponentSelectionDialog"; //$NON-NLS-1$ private IDialogSettings dialogSettings; + + private double lengthFactor = 1.0; private ResourceManager resourceManager; @@ -84,10 +88,15 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange // 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; @@ -125,6 +134,13 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange 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 @@ -143,12 +159,13 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange } protected List 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; } @@ -253,6 +270,10 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange 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); @@ -276,7 +297,6 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange updateInsertPosition(PositionType.NEXT); } }); - endButton.setSelection(true); label = new Label(composite, SWT.NONE); label.setText("Name"); @@ -296,14 +316,21 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange 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("Turn 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 @@ -317,7 +344,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange @Override public void keyReleased(KeyEvent e) { try { - length = Double.parseDouble(lengthText.getText()); + length = Double.parseDouble(lengthText.getText()) / lengthFactor; } catch (NumberFormatException err) { length = null; } @@ -353,19 +380,31 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange @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; } @@ -378,7 +417,10 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange 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); @@ -392,9 +434,9 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange 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; } @@ -426,6 +468,18 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange filterAllowed.clear(); Set filterAllowed = new HashSet(); 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. @@ -433,7 +487,15 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange } else { lenghtAdjustable = ((selected.getType() == Type.INLINE) && (selected.isVariable() || selected.isModifiable())); - if (insertAdjustable) { + + if (component.getNext() != null && component.getPrevious() != null) { + // 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); @@ -500,13 +562,15 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange 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); @@ -514,8 +578,10 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange 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. @@ -533,8 +599,19 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange 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); @@ -564,8 +641,8 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange this.filterAllowed.add(t); } - if (name.isEmpty() || usedNames.contains(name)) - ok = false; + validationLabel.setText(msg != null ? msg : ""); + validationLabel.requestLayout(); getButton(OK).setEnabled(ok); } @@ -622,4 +699,8 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange return lenghtAdjustable; } + public Double getThickness() { + return thickness; + } + }