Add units to ComponentSelectionDialog

gitlab #136

Change-Id: I0af414dc4306188e555143f96bbdb44cb28529b0
(cherry picked from commit a8e2da6aed4e09c8f1a336aac903b9a5acee2d53)

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
index b82a097cb7b250b554588e942ad832c8f358ff21..f87e63f70aa216639bc947d8e3dc9f5bf3f53f09 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
@@ -52,6 +52,7 @@ public class AddComponentAction extends vtkSwtAction {
        private String libUri;
        
        private double lengthFactor = 1.0;
+       private String lengthUnit = "m";
        
        public AddComponentAction(InteractiveVtkComposite panel, P3DRootNode root, String libUri) {
                super(panel);
@@ -67,6 +68,10 @@ public class AddComponentAction extends vtkSwtAction {
                this.lengthFactor = lengthFactor;
        }
 
+       public void setLengthUnit(String lengthUnit) {
+               this.lengthUnit = lengthUnit;
+       }
+
        public void setComponent(PipelineComponent component) {
                this.component = component;
                
@@ -106,6 +111,7 @@ public class AddComponentAction extends vtkSwtAction {
                // Set list of already reserved component names
                dialog.addUsedNames(ComponentUtils.getPipelineComponentNames(root));
                dialog.setLengthFactor(lengthFactor);
+               dialog.setLengthUnit(lengthUnit);
                
                if (dialog.open() == ComponentSelectionDialog.CANCEL)
                        return;

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 2321c1f9941fbd89f2251c6b64b9f89a2ec8efea..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
@@ -59,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;
 
@@ -162,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;
@@ -195,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);
@@ -260,8 +265,8 @@ 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();
@@ -284,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);
@@ -323,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("");
@@ -444,7 +467,7 @@ 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)) {
                        if (turnViewer != null)