Add units to ComponentSelectionDialog

[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 207f929e9cc24c55ab316b3b15faf3124148abf1..3cfe2a94c664d39558387b4b51a3824955d41956 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -3,6 +3,7 @@ package org.simantics.plant3d.dialog;
 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;
@@ -58,6 +59,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
        private IDialogSettings dialogSettings;
        
        private double lengthFactor = 1.0;
+       private String lengthUnit = "m";
 
        private ResourceManager resourceManager;
 
@@ -161,6 +163,10 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                this.lengthFactor = lengthFactor;
        }
 
+       public void setLengthUnit(String lengthUnit) {
+               this.lengthUnit = lengthUnit;
+       }
+
        @Override
        protected IDialogSettings getDialogBoundsSettings() {
                return dialogSettings;
@@ -194,7 +200,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                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);
@@ -233,12 +239,22 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
 
                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");
                }
 
                // Only allow elbows and ends to be added to open ends of the pipelines
-               boolean isOpen = component.getNext() == null || component.getPrevious() == null;
                if (isOpen) {
                        if (!turns.isEmpty()) {
                                turnViewer = createItemList(expandBar, turns, "Elbow");
@@ -249,8 +265,14 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                        }
                }
 
-               GridDataFactory.fillDefaults().grab(true, true).align(SWT.FILL, SWT.FILL).span(2, 1).applyTo(expandBar);
-               GridDataFactory.fillDefaults().grab(true, true).minSize(500, 500).hint(500, 500).applyTo(composite);
+               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);
+
+               // 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");
@@ -267,7 +289,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                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);
@@ -306,26 +328,44 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                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(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("");
@@ -427,11 +467,13 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                horizFillData.applyTo(thicknessText);
                horizFillData.applyTo(turnRadiusText);
                
-               GridDataFactory.fillDefaults().span(2, 1).align(SWT.END, SWT.END).grab(true, false).applyTo(validationLabel);
+               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;
                }
 
@@ -645,6 +687,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                        } else {
                                turnRadiusText.setEnabled(false);
                                diameterText.setEnabled(false);
+                               thicknessText.setEnabled(false);
                        }
 
                        if (!selected.isVariable()) {