X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Factions%2FAddComponentAction.java;h=9b3d90835e14a3961f5c9af0c48fd7ead86417dc;hb=3f41b7ad6b1bf03b8e7b27a6c6d5809c0ae495c8;hp=88ab98383633de72e05bfb8b380528c1b8f5eaab;hpb=a1e1faa6915445e786f482170576b9c9d0f5d982;p=simantics%2F3d.git

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 88ab9838..9b3d9083 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java
@@ -6,6 +6,8 @@ import java.awt.event.MouseWheelEvent;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.resource.ResourceLocator;
 import org.eclipse.swt.widgets.Display;
 import org.simantics.db.Resource;
 import org.simantics.g3d.math.MathTools;
@@ -42,21 +44,29 @@ public class AddComponentAction extends vtkSwtAction {
 	
 	private Item toAdd = null;
 	private PositionType insertPosition;
+	@SuppressWarnings("unused")
 	private boolean insertAdjustable;
+	@SuppressWarnings("unused")
 	private boolean lengthAdjustable;
 	
 	private String libUri;
 	
+	private double lengthFactor = 1.0;
+	
 	public AddComponentAction(InteractiveVtkComposite panel, P3DRootNode root, String libUri) {
 		super(panel);
 		this.root = root;
 		setText("Add Component");
-		setImageDescriptor(Activator.imageDescriptorFromPlugin(Activator.PLUGIN_ID, "icons/Component.png"));
+		setImageDescriptor(ResourceLocator.imageDescriptorFromBundle(Activator.PLUGIN_ID, "icons/Component.png").get());
 		nodeMap = root.getNodeMap();
 		gizmo = new TerminalSelectionGizmo(panel);
 		this.libUri = libUri;
 	}
 	
+	public void setLengthFactor(double lengthFactor) {
+		this.lengthFactor = lengthFactor;
+	}
+
 	public void setComponent(PipelineComponent component) {
 		this.component = component;
 		
@@ -79,8 +89,11 @@ public class AddComponentAction extends vtkSwtAction {
 		setEnabled(allowed.size() > 0);
 	}
 	
+	private String name;
+	
 	private Double length;
 	private Double angle;
+	private Double rotationAngle;
 	private Double diameter;
 	private Double turnRadius;
 	
@@ -88,16 +101,23 @@ public class AddComponentAction extends vtkSwtAction {
 	public void run() {
 		
 		ComponentSelectionDialog dialog = new ComponentSelectionDialog(Display.getCurrent().getActiveShell(), allowed, component, libUri);
+		
+		// Set list of already reserved component names
+		dialog.addUsedNames(ComponentUtils.getPipelineComponentNames(root));
+		dialog.setLengthFactor(lengthFactor);
+		
 		if (dialog.open() == ComponentSelectionDialog.CANCEL)
 			return;
 		toAdd = dialog.getSelected();
 		if (toAdd == null)
 			return;
+		this.name = dialog.getName();
 		this.insertPosition = dialog.getInsertPosition();
 		this.insertAdjustable = dialog.isInsertAdjustable();
 		this.lengthAdjustable = dialog.isLenghtAdjustable();
 		this.length = dialog.getLength();
 		this.angle = dialog.getAngle();
+		this.rotationAngle = dialog.getRotationAngle();
 		this.diameter = dialog.getDiameter();
 		this.turnRadius = dialog.getTurnRadius();
 		allowed = dialog.filterAllowed();
@@ -168,13 +188,20 @@ public class AddComponentAction extends vtkSwtAction {
 	
 	public void doInsert(PositionType position) {
 		try  {
+			if (position == PositionType.SPLIT && length != null && length > component.getControlPoint().getLength()) {
+				MessageDialog.openError(panel.getComponent().getShell(), "Error", "There is no room for a component of length " + length * lengthFactor + " units");
+				return;
+			}
+			
 			InsertInstruction inst = new InsertInstruction();
 			inst.typeUri = toAdd.getUri();
+			inst.name = name;
 			inst.angle = angle != null ? MathTools.degToRad(angle) : null;
 			inst.diameter = diameter;
 			inst.length = length;
 			inst.turnRadius = turnRadius;
 			inst.insertPosition = insertPosition;
+			inst.rotationAngle = rotationAngle;
 			inst.position = position;
 			ComponentUtils.addComponent(root, component, inst);
 		} catch (Exception e) {