]> gerrit.simantics Code Review - simantics/3d.git/blobdiff - org.simantics.plant3d/src/org/simantics/plant3d/dialog/ComponentSelectionDialog.java
Allow adding adjustable length components in the middle of a pipe
[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / dialog / ComponentSelectionDialog.java
index e5e220af561866364d72a7b6427b8474e1598527..00b52f3bb1073b0e12e1cb43dd64b5b18f47b97d 100644 (file)
@@ -7,15 +7,23 @@ import java.util.Set;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.resource.JFaceResources;
+import org.eclipse.jface.resource.LocalResourceManager;
+import org.eclipse.jface.resource.ResourceManager;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.ListViewer;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.KeyAdapter;
 import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.ExpandBar;
@@ -24,6 +32,13 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.simantics.db.exception.DatabaseException;
+import org.simantics.plant3d.Activator;
+import org.simantics.plant3d.ontology.Plant3D;
+import org.simantics.plant3d.scenegraph.EndComponent;
+import org.simantics.plant3d.scenegraph.InlineComponent;
+import org.simantics.plant3d.scenegraph.Nozzle;
+import org.simantics.plant3d.scenegraph.PipelineComponent;
+import org.simantics.plant3d.scenegraph.TurnComponent;
 import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint.PositionType;
 import org.simantics.plant3d.utils.Item;
 import org.simantics.plant3d.utils.Item.Type;
@@ -32,32 +47,79 @@ import org.simantics.utils.ui.ExceptionUtils;
 
 public class ComponentSelectionDialog extends Dialog implements ISelectionChangedListener{
 
+       private ResourceManager resourceManager;
+       
+       private String libUri;
+       
        private Item selected;
        private Set<PositionType> allowed;
        private Set<PositionType> filterAllowed;
+       //private boolean positionAdjustment;
+       private PipelineComponent component;
+       private boolean insertAdjustable;
+       private boolean lenghtAdjustable;
+       private PositionType insertPosition = PositionType.NEXT; 
+       
        private Double angle;
        private Double length;
+       private Double rotationAngle;
        
+       // In-line component
        private Text lengthText;
+       // Turn component
        private Text angleText;
+       // Rotated In-line, or turn conponent.
+       private Text rotationAngleText;
        
+       // Input for new PipeRun
        private Double diameter;
        private Double turnRadius;
        
        private Text diameterText;
        private Text turnRadiusText;
        
+       // Position selection
+       private Button startButton;
+       private Button middleButton;
+       private Button endButton;
+       
        private boolean inlineSplit = false;
        
+       ListViewer inlineViewer;
+       ListViewer turnViewer;
+       ListViewer endViewer;
+       
        
-       public ComponentSelectionDialog(Shell parentShell, Set<PositionType> allowed) {
-               super(parentShell);
-               this.allowed = allowed;
-               filterAllowed = new HashSet<PositionType>();
+       public ComponentSelectionDialog(Shell parentShell, Set<PositionType> allowed, PipelineComponent component){
+               this(parentShell, allowed, component, Plant3D.URIs.Builtin);
        }
        
+       public ComponentSelectionDialog(Shell parentShell, Set<PositionType> allowed, PipelineComponent component, String libUri){
+        super(parentShell);
+        this.allowed = allowed;
+        this.component = component;
+        filterAllowed = new HashSet<PositionType>();
+        insertAdjustable = component instanceof InlineComponent ? ((InlineComponent)component).isVariableLength() : false;
+        lenghtAdjustable = false;
+        this.libUri = libUri;
+    }
+       
+        protected List<Item> getItems(Class c, String libUri) throws DatabaseException{
+            if (InlineComponent.class.equals(c)) {
+                return P3DUtil.getInlines(libUri);
+            } else if (TurnComponent.class.equals(c)) {
+                return P3DUtil.getTurns(libUri);
+            } else if (EndComponent.class.equals(c)) {
+                return P3DUtil.getEnds(libUri);
+            } else {
+                return null;
+            }
+        }
+       
        @Override
        protected Control createDialogArea(Composite parent) {
+               resourceManager = new LocalResourceManager(JFaceResources.getResources(), parent);
+               
                Composite composite = new Composite(parent, SWT.NONE);
                GridLayout layout = new GridLayout(2,false);
                layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
@@ -80,34 +142,37 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                List<Item> turns = null;
                List<Item> inlines = null;
                try {
-                       ends = P3DUtil.getEnds();
-                       turns= P3DUtil.getTurns();
-                       inlines = P3DUtil.getInlines();
+                       ends = getItems(EndComponent.class, libUri);
+                       turns= getItems(TurnComponent.class, libUri);
+                       inlines = getItems(InlineComponent.class, libUri);
                } catch (DatabaseException e) {
                        Label label = new Label(composite, SWT.NONE);
                        label.setText("Cannot load pipeline components: " + e.getMessage());
                        ExceptionUtils.logError(e);
                        return composite;
                }
+               ends = P3DUtil.filterUserComponents(ends);
+               turns = P3DUtil.filterUserComponents(turns);
+               inlines = P3DUtil.filterUserComponents(inlines);
                
                ExpandBar expandBar = new ExpandBar(composite, SWT.NONE);
                
                
                ExpandItem inlineItem = new ExpandItem(expandBar, SWT.NONE);
                inlineItem.setText("Inline");
-               ListViewer inlineViewer = new ListViewer(expandBar);
+               inlineViewer = new ListViewer(expandBar);
                inlineViewer.setLabelProvider(new ComponentLabelProvider());
                inlineViewer.setContentProvider(new ComponentContentProvider());
                
                ExpandItem turnItem = new ExpandItem(expandBar, SWT.NONE);
                turnItem.setText("Turn");
-               ListViewer turnViewer = new ListViewer(expandBar);
+               turnViewer = new ListViewer(expandBar);
                turnViewer.setLabelProvider(new ComponentLabelProvider());
                turnViewer.setContentProvider(new ComponentContentProvider());
                
                ExpandItem endItem = new ExpandItem(expandBar, SWT.NONE);
                endItem.setText("End");
-               ListViewer endViewer = new ListViewer(expandBar);
+               endViewer = new ListViewer(expandBar);
                endViewer.setLabelProvider(new ComponentLabelProvider());
                endViewer.setContentProvider(new ComponentContentProvider());
                
@@ -131,13 +196,55 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                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);
                
-               
                Label label = new Label(composite, SWT.NONE);
+               label.setText("Position");
+               Composite buttonComposite = new Composite(composite, SWT.NONE);
+               startButton = new Button(buttonComposite, SWT.TOGGLE);
+               middleButton = new Button(buttonComposite, SWT.TOGGLE);
+               endButton = new Button(buttonComposite, SWT.TOGGLE);
+               startButton.setImage(resourceManager.createImage(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/insert_start.png")));
+               middleButton.setImage(resourceManager.createImage(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/insert_middle.png")));
+               endButton.setImage(resourceManager.createImage(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/insert_end.png")));
+               startButton.setToolTipText("Overlapping insert");
+               middleButton.setToolTipText("Cutting insert");
+               endButton.setToolTipText("Adding insert");
+               GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.TOP).applyTo(buttonComposite);
+               GridLayoutFactory.fillDefaults().numColumns(3).applyTo(buttonComposite);
+               
+               startButton.setEnabled(false);
+               middleButton.setEnabled(false);
+               endButton.setEnabled(false);
+               
+               startButton.addSelectionListener(new SelectionAdapter() {
+                       @Override
+                       public void widgetSelected(SelectionEvent e) {
+                               updateInsertPosition(PositionType.PREVIOUS);
+                       }
+               });
+               
+               middleButton.addSelectionListener(new SelectionAdapter() {
+                       @Override
+                       public void widgetSelected(SelectionEvent e) {
+                               updateInsertPosition(PositionType.SPLIT);
+                       }
+               });
+               endButton.addSelectionListener(new SelectionAdapter() {
+                       @Override
+                       public void widgetSelected(SelectionEvent e) {
+                               updateInsertPosition(PositionType.NEXT);
+                       }
+               });
+               endButton.setSelection(true);
+               
+               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("Angle");
                angleText = new Text(composite, SWT.SINGLE|SWT.BORDER);
+               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("Diameter");
@@ -148,9 +255,11 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                
                lengthText.setEnabled(false);
                angleText.setEnabled(false);
+               rotationAngleText.setEnabled(false);
                turnRadiusText.setEnabled(false);
                diameterText.setEnabled(false);
                
+               
                lengthText.addKeyListener(new KeyAdapter() {
                        @Override
                        public void keyReleased(KeyEvent e) {
@@ -175,6 +284,18 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                        }
                });
                
+               rotationAngleText.addKeyListener(new KeyAdapter() {
+            @Override
+            public void keyReleased(KeyEvent e) {
+                try {
+                    rotationAngle = Double.parseDouble(rotationAngleText.getText());
+                } catch (NumberFormatException err) {
+                    rotationAngle = null;
+                }
+                validate();
+            }
+        });
+               
                diameterText.addKeyListener(new KeyAdapter() {
                        @Override
                        public void keyReleased(KeyEvent e) {
@@ -201,6 +322,7 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                
                GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.TOP).applyTo(lengthText);
                GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.TOP).applyTo(angleText);
+               GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.TOP).applyTo(rotationAngleText);
                GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.TOP).applyTo(diameterText);
                GridDataFactory.fillDefaults().grab(true, false).align(SWT.FILL, SWT.TOP).applyTo(turnRadiusText);
                
@@ -214,11 +336,33 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
        }
        
        
+       private void updateInsertPosition(PositionType type) {
+               if (insertPosition == type)
+                       return;
+               endButton.setSelection(type == PositionType.NEXT);
+               middleButton.setSelection(type == PositionType.SPLIT);
+               startButton.setSelection(type == PositionType.PREVIOUS);
+               insertPosition = type;
+       }
+       
        @Override
        public void selectionChanged(SelectionChangedEvent event) {
                IStructuredSelection sel = (IStructuredSelection)event.getSelection();
-               selected = (Item)sel.getFirstElement();
-               validate();                     
+               Item i = (Item)sel.getFirstElement();
+               if (i != null) {
+                       selected = i;
+                       if (event.getSource() == inlineViewer) {
+                               turnViewer.setSelection(new StructuredSelection());
+                               endViewer.setSelection(new StructuredSelection());
+                       } else if (event.getSource() == turnViewer) {
+                               inlineViewer.setSelection(new StructuredSelection());
+                               endViewer.setSelection(new StructuredSelection());
+                       } else if (event.getSource() == endViewer) {
+                               inlineViewer.setSelection(new StructuredSelection());
+                               turnViewer.setSelection(new StructuredSelection());
+                       }
+                       validate();     
+               }
        }
        
        private void validate() {
@@ -230,18 +374,79 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                } else if (selected.isCode()) {// TODO : instead of disabling the button, we should filter the content.
                        ok = false;
                } else {
-                       if (selected.isVariable()) {
+                       lenghtAdjustable = ((selected.getType() == Type.INLINE) && (selected.isVariable() || selected.isModifiable()));
+                       if (insertAdjustable) {
+                               switch (selected.getType()) {
+                               case END:
+                                       startButton.setEnabled(false);
+                                       middleButton.setEnabled(false);
+                                       endButton.setEnabled(true);
+                                       updateInsertPosition(PositionType.NEXT);
+                                       break;
+                               case INLINE:
+                                       if (!selected.isVariable()) {
+                                               startButton.setEnabled(true);
+                                               middleButton.setEnabled(true);
+                                               endButton.setEnabled(true);
+                                       } else {
+                                               startButton.setEnabled(false);
+                                               middleButton.setEnabled(false);
+                                               endButton.setEnabled(true);
+                                               updateInsertPosition(PositionType.NEXT);
+                                       }
+                                       break;
+                               case NOZZLE:
+                                       startButton.setEnabled(false);
+                                       middleButton.setEnabled(false);
+                                       endButton.setEnabled(true);
+                                       updateInsertPosition(PositionType.NEXT);
+                                       break;
+                               case TURN:
+                                       startButton.setEnabled(false);
+                                       middleButton.setEnabled(true);
+                                       endButton.setEnabled(true);
+                                       if (insertPosition == PositionType.PREVIOUS)
+                                               updateInsertPosition(PositionType.NEXT);
+                                       break;
+                               case EQUIPMENT:
+                                       throw new RuntimeException("Expected component, got equipment " + selected);
+                               }
+                       } else if (lenghtAdjustable) {
+                               if (component instanceof InlineComponent) {
+                                       startButton.setEnabled(true);
+                                       middleButton.setEnabled(true);
+                                       endButton.setEnabled(true);
+                               } else if (component instanceof TurnComponent) {
+                                       startButton.setEnabled(false);
+                                       middleButton.setEnabled(true);
+                                       endButton.setEnabled(true);
+                                       if (insertPosition == PositionType.PREVIOUS)
+                                               updateInsertPosition(PositionType.NEXT);
+                               } else if (component instanceof EndComponent || component instanceof Nozzle) {
+                                       startButton.setEnabled(false);
+                                       middleButton.setEnabled(false);
+                                       endButton.setEnabled(true);
+                                       updateInsertPosition(PositionType.NEXT);
+                               }
+                       } else {
+                               startButton.setEnabled(false);
+                               middleButton.setEnabled(false);
+                               endButton.setEnabled(true);
+                       }
+                       if (selected.isVariable() || selected.isModifiable()) {
                                if (selected.getType() == Type.INLINE) {
                                        filterAllowed.add(PositionType.NEXT);
                                        filterAllowed.add(PositionType.PREVIOUS);
-                                       if (inlineSplit) {
+                                       if (inlineSplit && selected.isVariable()) {
                                                lengthText.setEnabled(false);
                                                angleText.setEnabled(false);
+                                               rotationAngleText.setEnabled(selected.isRotated());
                                                ok = false;
                                                
                                        } else {
                                                lengthText.setEnabled(true);
                                                angleText.setEnabled(false);
+                                               rotationAngleText.setEnabled(selected.isRotated());
                                                if (length == null)
                                                        ok = false;
                                        }
@@ -250,16 +455,20 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                                        filterAllowed.add(PositionType.PREVIOUS);
                                        lengthText.setEnabled(false);
                                        angleText.setEnabled(true);
+                                       rotationAngleText.setEnabled(true);
                                        if (angle == null)
                                                ok = false;
                                } else {
-                                       // this should not happen
+                                       // this should not happen, since end components should not have variable, or modifiable flag.
                                        lengthText.setEnabled(false);
                                        angleText.setEnabled(false);
+                                       rotationAngleText.setEnabled(false);
+                                       
                                }
                        } else {
                                lengthText.setEnabled(false);
-                               angleText.setEnabled(false);                    
+                               angleText.setEnabled(false);
+                               rotationAngleText.setEnabled(selected.getType() == Type.TURN || selected.isRotated());
                        }
                
                        if (selected.isSizeChange()) {
@@ -320,6 +529,10 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                return length;
        }
        
+       public Double getRotationAngle() {
+        return rotationAngle;
+    }
+       
        public Double getDiameter() {
                return diameter;
        }
@@ -332,5 +545,16 @@ public class ComponentSelectionDialog extends Dialog implements ISelectionChange
                return filterAllowed;
        }
        
+       public PositionType getInsertPosition() {
+               return insertPosition;
+       }
+       
+       public boolean isInsertAdjustable() {
+               return insertAdjustable;
+       }
+       
+       public boolean isLenghtAdjustable() {
+               return lenghtAdjustable;
+       }
 
 }