Merge changes Ia3e00f11,I7f3a3a75

[simantics/3d.git] / org.simantics.g3d.vtk / src / org / simantics / g3d / vtk / swt / TranslateAction.java

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/TranslateAction.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/TranslateAction.java
index 32274f037864573f1afaef25cf33211133aad318..83c434bb6ee15bdcada1aee42e3019e62e8e8d42 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/TranslateAction.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/TranslateAction.java
@@ -13,6 +13,7 @@ package org.simantics.g3d.vtk.swt;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 import java.math.BigDecimal;
 
 import javax.vecmath.AxisAngle4d;
@@ -98,7 +99,7 @@ public class TranslateAction extends vtkSwtAction{
        public void deattach() {
                
                node = null;
-               nodeMap.commit();
+               nodeMap.commit("Translate");
                deattachUI();
                super.deattach();
                panel.refresh();
@@ -331,6 +332,11 @@ public class TranslateAction extends vtkSwtAction{
                return true;
        }
        
+       @Override
+    public boolean mouseWheelMoved(MouseWheelEvent e) {
+        return getDefaultAction().mouseWheelMoved(e);
+    }
+       
        protected void setPos(Vector3d pos) {
                node.setPosition(pos);
        }