Replace "turn" with "elbow" in component creation UI

[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 fb5060922a7aaf24678c692686bee4fca59e001e..cce00075faf8b1940ab2da5988f4dbbad5d92df3 100644 (file)
--- a/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
@@ -134,6 +134,9 @@ 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) {
@@ -219,7 +222,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                inlineViewer.setContentProvider(new ComponentContentProvider());
 
                ExpandItem turnItem = new ExpandItem(expandBar, SWT.NONE);
-               turnItem.setText("Turn");
+               turnItem.setText("Elbow");
                turnViewer = new ListViewer(expandBar);
                turnViewer.setLabelProvider(new ComponentLabelProvider());
                turnViewer.setContentProvider(new ComponentContentProvider());
@@ -267,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);
@@ -290,7 +297,11 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                                updateInsertPosition(PositionType.NEXT);
                        }
                });
-               endButton.setSelection(true);
+               
+               if (!hasInsertPosition()) {
+                       label.setVisible(false);
+                       buttonComposite.setVisible(false);
+               }
 
                label = new Label(composite, SWT.NONE);
                label.setText("Name");
@@ -313,7 +324,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                label.setText("Wall thickness");
                thicknessText = new Text(composite, SWT.SINGLE | SWT.BORDER);
                label = new Label(composite, SWT.NONE);
-               label.setText("Turn radius");
+               label.setText("Elbow radius");
                turnRadiusText = new Text(composite, SWT.SINGLE | SWT.BORDER);
                
                validationLabel = new Label(composite, SWT.NONE);
@@ -425,12 +436,16 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                return composite;
        }
 
+       private boolean hasInsertPosition() {
+               return component.getNext() == null || component.getPrevious() == null;
+       }
+
        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;
        }
 
@@ -481,7 +496,15 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                } else {
                        lenghtAdjustable = ((selected.getType() == Type.INLINE)
                                        && (selected.isVariable() || selected.isModifiable()));
-                       if (insertAdjustable) {
+                       
+                       if (!hasInsertPosition()) {
+                               // 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);