Prevent elbows overlapping nozzles

[simantics/3d.git] / org.simantics.plant3d / src / org / simantics / plant3d / actions / TranslateInlineAction.java

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 594c73d3688808109c03d86de18d1a1671007cda..3aac1fd99b005f50473c46c7ee0d025360900023 100644 (file)
--- 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"));
        }
        
@@ -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);