X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Fdialog%2FComponentSelectionDialog.java;h=fb5060922a7aaf24678c692686bee4fca59e001e;hb=c6e13a2972fe12620f00f06a97d8746780cb22b1;hp=030cce9f12d47c89c8d5d12dcea1a716372c60fb;hpb=d207cfa3235339e7d7b894494be400160b121bd5;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 030cce9f..fb506092 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -88,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;
@@ -305,14 +310,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
@@ -369,6 +381,18 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 				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
@@ -387,7 +411,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);
@@ -435,6 +462,18 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		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.
@@ -509,13 +548,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);
@@ -523,8 +564,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.
@@ -542,8 +585,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);
@@ -573,8 +627,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);
 	}
@@ -631,4 +685,8 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 		return lenghtAdjustable;
 	}
 
+	public Double getThickness() {
+		return thickness;
+	}
+
 }