Add a wall thickness property to pipe runs.

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / dialog / ComponentSelectionDialog.java

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 95b22512b7b06e534fe810a4ec37e195c179f930..c0851fd25d19913b8ed4b114b34bfd8fc551633e 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -7,6 +7,7 @@ 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;
@@ -33,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;
@@ -49,6 +52,12 @@ import org.simantics.utils.ui.ExceptionUtils;
 
 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 ResourceManager resourceManager;
 
        private String libUri;
@@ -74,14 +83,16 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
        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;
 
        // Position selection
@@ -113,8 +124,24 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                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);
        }
        
+       public void setLengthFactor(double lengthFactor) {
+               this.lengthFactor = lengthFactor;
+       }
+
+       @Override
+       protected IDialogSettings getDialogBoundsSettings() {
+               return dialogSettings;
+       }
+
        @Override
        protected void configureShell(Shell newShell) {
                super.configureShell(newShell);
@@ -126,12 +153,13 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
        }
 
        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;
                }
@@ -179,7 +207,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                turns = P3DUtil.filterUserComponents(turns);
                inlines = P3DUtil.filterUserComponents(inlines);
 
-               ExpandBar expandBar = new ExpandBar(composite, SWT.NONE);
+               ExpandBar expandBar = new ExpandBar(composite, SWT.V_SCROLL);
 
                ExpandItem inlineItem = new ExpandItem(expandBar, SWT.NONE);
                inlineItem.setText("Inline");
@@ -216,7 +244,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                endViewer.addSelectionChangedListener(this);
 
                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);
+               GridDataFactory.fillDefaults().grab(true, true).minSize(500, 500).hint(500, 500).applyTo(composite);
 
                Label label = new Label(composite, SWT.NONE);
                label.setText("Position");
@@ -279,7 +307,10 @@ 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);
 
                lengthText.setEnabled(false);
@@ -287,6 +318,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                rotationAngleText.setEnabled(false);
                turnRadiusText.setEnabled(false);
                diameterText.setEnabled(false);
+               thicknessText.setEnabled(false);
 
                nameText.addKeyListener(new KeyAdapter() {
                        @Override
@@ -300,7 +332,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;
                                }
@@ -336,19 +368,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;
                                }
@@ -361,6 +405,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                horizFillData.applyTo(angleText);
                horizFillData.applyTo(rotationAngleText);
                horizFillData.applyTo(diameterText);
+               horizFillData.applyTo(thicknessText);
                horizFillData.applyTo(turnRadiusText);
 
                if (!allowed.contains(PositionType.NEXT) && !allowed.contains(PositionType.PREVIOUS)) {
@@ -516,7 +561,8 @@ 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 || turnRadius == null || thickness == null)
                                        ok = false;
                        } else {
                                turnRadiusText.setEnabled(false);
@@ -605,4 +651,8 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                return lenghtAdjustable;
        }
 
+       public Double getThickness() {
+               return thickness;
+       }
+
 }