X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Factions%2FTranslateInlineAction.java;h=91cc3ceae233e2c68f2f300ed2a612f158ba5620;hb=5c3aac4fe749c3a12b66823116dc43472bab869d;hp=7ea42d597b3365ca4b3951fbab2c8b9b47120bfd;hpb=62fb6eb651ae640336d71746d7bfa79bcfa211df;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateInlineAction.java b/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateInlineAction.java
index 7ea42d59..91cc3cea 100644
--- a/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateInlineAction.java
+++ b/org.simantics.plant3d/src/org/simantics/plant3d/actions/TranslateInlineAction.java
@@ -9,6 +9,8 @@ import javax.vecmath.Vector3d;
 import org.simantics.g3d.math.MathTools;
 import org.simantics.g3d.math.Ray;
 import org.simantics.g3d.scenegraph.IG3DNode;
+import org.simantics.g3d.scenegraph.base.INode;
+import org.simantics.g3d.toolbar.ToolComposite;
 import org.simantics.g3d.vtk.common.VTKNodeMap;
 import org.simantics.g3d.vtk.swt.InteractiveVtkComposite;
 import org.simantics.g3d.vtk.swt.TranslateAction;
@@ -20,12 +22,14 @@ import org.simantics.plant3d.scenegraph.controlpoint.PipeControlPoint.Direction;
 
 public class TranslateInlineAction extends TranslateAction{
 	
+    private boolean inline;
+    
 	private Vector3d s;
 	private Vector3d e;
 	private Vector3d dir;
 
-	public TranslateInlineAction(InteractiveVtkComposite panel, VTKNodeMap nodeMap) {
-		super(panel, nodeMap);
+	public TranslateInlineAction(InteractiveVtkComposite panel, VTKNodeMap<?, ? extends INode> nodeMap, ToolComposite toolComposite) {
+		super(panel, nodeMap, toolComposite);
 		setImageDescriptor(Activator.imageDescriptorFromPlugin("com.famfamfam.silk", "icons/arrow_refresh.png"));
 	}
 	
@@ -35,10 +39,15 @@ public class TranslateInlineAction extends TranslateAction{
 		if (node instanceof InlineComponent) {
 			InlineComponent comp = (InlineComponent)node;
 			if (comp.isVariableLength()) {
-				setEnabled(false);
-			} else {
+                setEnabled(false);
+			} else if (comp.getNext() == null || comp.getPrevious() == null) {
+                setEnabled(true);
+                inline = false;
+                dir = comp.getControlPoint().getInlineDir();
+                dir.normalize();
+            } else {
 				setEnabled(true);
-			
+				inline = true;
 				PipelineComponent prev = comp.getPrevious();
 				PipelineComponent next = comp.getNext();
 				if (prev == null || next == null) {
@@ -46,29 +55,28 @@ public class TranslateInlineAction extends TranslateAction{
 					setEnabled(false);
 					return;
 				}
-				if (prev.getControlPoint().isInline() && !prev.getControlPoint().isFixed() && prev.getPrevious() != null)
+				if (prev.getControlPoint().isInline() && !prev.getControlPoint().isFixedLength() && prev.getPrevious() != null)
 					prev = prev.getPrevious();
-				if (next.getControlPoint().isInline() && !next.getControlPoint().isFixed() && next.getNext() != null) {
+				if (next.getControlPoint().isInline() && !next.getControlPoint().isFixedLength() && next.getNext() != null) {
 					next = next.getNext();
 				}
 				Point3d ns = new Point3d();
 				Point3d ne = new Point3d();
 				Point3d ps = new Point3d();
 				Point3d pe = new Point3d();
-				next.getControlPointEnds(ns, ne);
-				prev.getControlPointEnds(ps, pe);
-				dir = comp.getControlPoint().getPathLegDirection(Direction.NEXT);
-				dir.normalize();
+				next.getEnds(ns, ne);
+				prev.getEnds(ps, pe);
+				dir = comp.getControlPoint().getInlineDir();
 				// We may have offsets in the path leg, hence we have to project the coordinates.
 				Vector3d wp = node.getWorldPosition();
 				if (prev.getControlPoint().isVariableLength())
-				    s = MathTools.closestPointOnStraight(ps, wp, dir);
+					s = MathTools.closestPointOnStraight(ps, wp, dir);
 				else
-				    s = MathTools.closestPointOnStraight(pe, wp, dir);
+					s = MathTools.closestPointOnStraight(pe, wp, dir);
 				if (next.getControlPoint().isVariableLength())
-				    e = MathTools.closestPointOnStraight(ne, wp, dir);
+					e = MathTools.closestPointOnStraight(ne, wp, dir);
 				else
-				    e = MathTools.closestPointOnStraight(ns, wp, dir);
+					e = MathTools.closestPointOnStraight(ns, wp, dir);
 				// Remove component's own space from end points to get actual movement range
 				double l = comp.getControlPoint().getInlineLength();
 				Vector3d ld = new Vector3d(dir);
@@ -81,15 +89,24 @@ public class TranslateInlineAction extends TranslateAction{
 		}
 	}
 	
+	@Override
+	protected void createTools(ToolComposite toolComposite) {
+	    
+	}
+	
 	@Override
 	public boolean keyPressed(KeyEvent e) {
 		if (e.getKeyCode() == KeyEvent.VK_ESCAPE)
 			panel.useDefaultAction();
-		if (valid)
-			return true;
-		
-		update();
-		return true;
+		if (!inline) {
+		    return super.keyPressed(e);
+		} else {
+    		if (valid)
+    			return true;
+    		
+    		update();
+    		return true;
+		}
 	}
 	
 	@Override
@@ -99,46 +116,50 @@ public class TranslateInlineAction extends TranslateAction{
 	
 	@Override
 	public boolean mouseDragged(MouseEvent e) {
-		if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) > 0 && valid) { 
-			
-			Vector3d translate = getTranslate(e.getX(), e.getY(), prevTranslate);
-			//System.out.println("translate " + translate);
-			if (translate == null)
-				return true;
-			//boolean step = ((e.getModifiers() & MouseEvent.CTRL_MASK) > 0);
-			Vector3d pos = new Vector3d(node.getWorldPosition());
-			//pos.add(translate);
-			pos.set(translate);
-			//pos = constaints(pos, step);
-			setWorldPos(pos);
-			
-			//mapping.rangeModified(node);
-			
-			//nodeMap.modified(node);
-			update();
+		//if ((e.getModifiersEx() & MouseEvent.BUTTON1_DOWN_MASK) > 0 && valid) { 
+	    if (e.getButton() == MouseEvent.BUTTON1  && valid) {
+			if (inline) {
+    			Vector3d translate = getTranslate(e.getX(), e.getY(), prevTranslate);
+    			//System.out.println("translate " + translate);
+    			if (translate == null)
+    				return true;
+    			//boolean step = ((e.getModifiers() & MouseEvent.CTRL_MASK) > 0);
+    			Vector3d pos = new Vector3d(node.getWorldPosition());
+    			
+//    			System.out.println(pos + " " + translate);
+    			//pos.add(translate);
+    			pos.set(translate);
+    			//pos = constaints(pos, step);
+    			setWorldPos(pos);
+    			update();
+			} else {
+			    super.mouseDragged(e);
+			}
 		} else {
 			getDefaultAction().mouseDragged(e);
 			update();
-		}
+		} 
 		return true;
 	}
 	
-	
-	
 	protected Vector3d getTranslate(double x, double y, Vector3d offset) {
 		
 		Ray ray = vtkUtil.createMouseRay(panel.getRenderer(),x, y);
 		
 		Vector3d p = node.getWorldPosition();
 		
-		Vector3d i1 = new Vector3d();
-        Vector3d i2 = new Vector3d();
-        
-        double mu[] = new double[2];
-        MathTools.intersectStraightStraight( p, dir,ray.pos, ray.dir, i2, i1,mu);
-        
-        Vector3d t = MathTools.closestPointOnEdge(i1, s, e);
-        return t;
+		if (inline) {
+    		Vector3d i1 = new Vector3d();
+    		Vector3d i2 = new Vector3d();
+    		
+    		double mu[] = new double[2];
+    		MathTools.intersectStraightStraight( p, dir,ray.pos, ray.dir, i2, i1,mu);
+    		
+    		Vector3d t = MathTools.closestPointOnEdge(i1, s, e);
+    		return t;
+		} else {
+		    return super.getTranslate(x, y, offset);
+		}
 		
 	}