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=71637e54f4df136cd53d5ba956285f5be108b798;hp=594c73d3688808109c03d86de18d1a1671007cda;hpb=a1e1faa6915445e786f482170576b9c9d0f5d982;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 594c73d3..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;
@@ -26,8 +28,8 @@ public class TranslateInlineAction extends TranslateAction{
 	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"));
 	}
 	
@@ -41,7 +43,7 @@ public class TranslateInlineAction extends TranslateAction{
 			} else if (comp.getNext() == null || comp.getPrevious() == null) {
                 setEnabled(true);
                 inline = false;
-                dir = comp.getControlPoint().getPathLegDirection(Direction.NEXT);
+                dir = comp.getControlPoint().getInlineDir();
                 dir.normalize();
             } else {
 				setEnabled(true);
@@ -64,8 +66,7 @@ public class TranslateInlineAction extends TranslateAction{
 				Point3d pe = new Point3d();
 				next.getEnds(ns, ne);
 				prev.getEnds(ps, pe);
-				dir = comp.getControlPoint().getPathLegDirection(Direction.NEXT);
-				dir.normalize();
+				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())
@@ -88,6 +89,11 @@ public class TranslateInlineAction extends TranslateAction{
 		}
 	}
 	
+	@Override
+	protected void createTools(ToolComposite toolComposite) {
+	    
+	}
+	
 	@Override
 	public boolean keyPressed(KeyEvent e) {
 		if (e.getKeyCode() == KeyEvent.VK_ESCAPE)
@@ -120,7 +126,7 @@ public class TranslateInlineAction extends TranslateAction{
     			//boolean step = ((e.getModifiers() & MouseEvent.CTRL_MASK) > 0);
     			Vector3d pos = new Vector3d(node.getWorldPosition());
     			
-    			System.out.println(pos + " " + translate);
+//    			System.out.println(pos + " " + translate);
     			//pos.add(translate);
     			pos.set(translate);
     			//pos = constaints(pos, step);