X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fsrc%2Forg%2Fsimantics%2Fplant3d%2Factions%2FTranslateInlineAction.java;h=3aac1fd99b005f50473c46c7ee0d025360900023;hb=cc43aabf1f80291c17ece22060fbb0e690fb4864;hp=92a88b53ecdf21ba55b84feed4bbc914f8b611d5;hpb=064a7d0401dba71baae82737271620ca7bcb6bfa;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 92a88b53..3aac1fd9 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"));
 	}
 	
@@ -53,9 +55,9 @@ 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();
@@ -88,6 +90,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 +127,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);