]> gerrit.simantics Code Review - simantics/3d.git/commitdiff
Implemented mouse wheel zoom in camera and selector action 78/3078/1
authorMarko Luukkainen <marko.luukkainen@semantum.fi>
Thu, 8 Aug 2019 12:30:23 +0000 (15:30 +0300)
committerMarko Luukkainen <marko.luukkainen@semantum.fi>
Thu, 8 Aug 2019 12:30:23 +0000 (15:30 +0300)
* Previously mouse wheel zoom was done in native interactor, which
bypassed InteractiveVtkComposite render listener mechanism

gitlab #21

Change-Id: Ia22d34617dd9ef741b338b52343fb85e7b43d406

org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/TranslateAction.java
org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/vtkCameraAndSelectorAction.java
org.simantics.plant3d/src/org/simantics/plant3d/actions/AddComponentAction.java

index 32274f037864573f1afaef25cf33211133aad318..b6b5ca7f7dbe9175de60ac9b85b9c51591bceeb3 100644 (file)
@@ -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;
@@ -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);
        }
index 5b3e3a1fffe1ec2673039316ebb57dae685235a1..96f51c699435bd26243304bbf41144326a059c0c 100644 (file)
@@ -13,6 +13,7 @@ package org.simantics.g3d.vtk.swt;
 
 import java.awt.event.InputEvent;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -31,369 +32,357 @@ import vtk.vtkRenderWindow;
 import vtk.vtkRenderer;
 
 public class vtkCameraAndSelectorAction extends vtkSwtAction implements ISelectionProvider {
-       
-       protected vtkRenderer ren;
-       protected int lastX;
-       protected int lastY;
-       protected vtkRenderWindow rw;
-       protected vtkCamera cam;
-       protected int InteractionMode = 1;
-       
-       protected double activeRate = 5.0;
-       protected double passiveRate = 0.01;
-       protected boolean doNotRotate = true; 
-       
-       public vtkCameraAndSelectorAction(InteractiveVtkComposite panel) {
-               super(panel);
-               this.ren = panel.getRenderer();
-               this.rw = panel.getRenderWindow();
-               this.cam = ren.GetActiveCamera();
-       }
-       
-       public void Lock() {
-               panel.lock();
-       }
-       
-       public void UnLock() {
-               panel.unlock();
-       }
-       
-       public void InteractionModeRotate()
-         {
-           this.InteractionMode = 1;
-         }
-         
-         public void InteractionModeTranslate()
-         {
-           this.InteractionMode = 2;
-         }
-         
-         public void InteractionModeZoom()
-         {
-           this.InteractionMode = 3;
-         }
-         
-       public void resetCameraClippingRange() {
-           Lock();
-           ren.ResetCameraClippingRange();
-           UnLock();
-         }
-
-         public void resetCamera() {
-           Lock();
-           ren.ResetCamera();
-           UnLock();
-         }
-         
-        public boolean mousePressed(MouseEvent e)
-         {
-             
-           if (ren.VisibleActorCount() == 0) return false;
-           rw.SetDesiredUpdateRate(activeRate);
-           lastX = e.getX();
-           lastY = e.getY();
-           if ((e.getModifiers()==InputEvent.BUTTON2_MASK) ||
-               (e.getModifiers()==(InputEvent.BUTTON1_MASK | InputEvent.SHIFT_MASK)))
-             {
-               InteractionModeTranslate();
-             }
-           else if (e.getModifiers()==InputEvent.BUTTON3_MASK)
-             {
-               InteractionModeZoom();
-             }
-           else 
-             {
-               InteractionModeRotate();
-             }
-           return true;
-         }
-        
-        public boolean mouseReleased(MouseEvent e)
-         {
-           rw.SetDesiredUpdateRate(passiveRate);
-           return true;
-         }
-        
-
-        
-        public boolean mouseDragged(MouseEvent e)
-         {
-           if (ren.VisibleActorCount() == 0) return false;
-           int x = e.getX();
-           int y = e.getY();
-           // rotate
-           if (this.InteractionMode == 1)
-             {
-               cam.Azimuth(lastX - x);
-               cam.Elevation(y - lastY);
-               if (doNotRotate)
-                       cam.SetRoll(0);
-               cam.OrthogonalizeViewUp();
-               resetCameraClippingRange();
-               //panel.UpdateLight();
-             }
-           // translate
-           if (this.InteractionMode == 2)
-             {
-               double  FPoint[];
-               double  PPoint[];
-               double  APoint[] = new double[3];
-               double  RPoint[];
-               double focalDepth;
-               
-               // get the current focal point and position
-               FPoint = cam.GetFocalPoint();
-               PPoint = cam.GetPosition();
-               
-               // calculate the focal depth since we'll be using it a lot
-               ren.SetWorldPoint(FPoint[0],FPoint[1],FPoint[2],1.0);
-               ren.WorldToDisplay();
-               focalDepth = ren.GetDisplayPoint()[2];
-               
-               APoint[0] = rw.GetSize()[0]/2.0 + (x - lastX);
-               APoint[1] = rw.GetSize()[1]/2.0 - (y - lastY);
-               APoint[2] = focalDepth;
-               ren.SetDisplayPoint(APoint);
-               ren.DisplayToWorld();
-               RPoint = ren.GetWorldPoint();
-               if (RPoint[3] != 0.0)
-                 {
-                   RPoint[0] = RPoint[0]/RPoint[3];
-                   RPoint[1] = RPoint[1]/RPoint[3];
-                   RPoint[2] = RPoint[2]/RPoint[3];
-                 }
-               
-               /*
-                * Compute a translation vector, moving everything 1/2 
-                * the distance to the cursor. (Arbitrary scale factor)
-                */
-               cam.SetFocalPoint(
-                                 (FPoint[0]-RPoint[0])/2.0 + FPoint[0],
-                                 (FPoint[1]-RPoint[1])/2.0 + FPoint[1],
-                                 (FPoint[2]-RPoint[2])/2.0 + FPoint[2]);
-               cam.SetPosition(
-                               (FPoint[0]-RPoint[0])/2.0 + PPoint[0],
-                               (FPoint[1]-RPoint[1])/2.0 + PPoint[1],
-                               (FPoint[2]-RPoint[2])/2.0 + PPoint[2]);
-               resetCameraClippingRange();
-             }
-           // zoom
-           if (this.InteractionMode == 3)
-             {
-               double zoomFactor;
-               //double clippingRange[];
-               
-               zoomFactor = Math.pow(1.02,(y - lastY));
-               if (cam.GetParallelProjection() == 1)
-                 {
-                   cam.SetParallelScale(cam.GetParallelScale()/zoomFactor);
-                 }
-               else
-                 {
-                   cam.Dolly(zoomFactor);
-                   resetCameraClippingRange();
-                 }
-             }
-           lastX = x;
-           lastY = y;
-           panel.refresh();
-           return true;
-         }
-
-        
-               private List<vtkProp> selectActors = new ArrayList<vtkProp>();
-               private List<vtkProp> hoverActor = new ArrayList<vtkProp>();
-        
-               @Override
-               public boolean mouseClicked(MouseEvent e) {
-                       if (!panel.getComponent().isFocusControl())
-                               return false;
-                       if (e.getButton() != MouseEvent.BUTTON1)
-                               return false;
-                       vtkProp spick[] = panel.pick(e.getX(), e.getY());
-                       if (spick != null && spick.length > 0) {
-                               for (vtkProp selectActor : spick) {
-                                       if (!e.isControlDown()) {
-                                               selectActors.clear();
-                                               selectActors.add(selectActor);
-                                       } else {
-                                               if (selectActors.contains(selectActor))
-                                                       selectActors.remove(selectActor);
-                                               else
-                                                       selectActors.add(selectActor);
-                                       }
-                               }
-                               fireSelectionChanged();
-                       } else if (!e.isControlDown()) {
-                               selectActors.clear();
-                               fireSelectionChanged();
-                       }
-                       return true;
-//                     if (e.getClickCount() > 1)
-//                             updatePickRay(e.getX(), e.getY());
-                       
-               }
-               
-//             private void updatePickRay(double x , double y) {
-//                     Ray ray = vtkUtil.createMouseRay(panel.GetRenderer(), x, y);
-//                     
-//                     
-//                     System.out.println(ray.pos + " " + ray.dir);
-//                     vtkPoints linePoints = new vtkPoints();
-//                     linePoints.InsertPoint(0,ray.pos.x, ray.pos.y, ray.pos.z);
-//                     linePoints.InsertPoint(1, ray.pos.x + ray.dir.x, ray.pos.y + ray.dir.y, ray.pos.z + ray.dir.z);
-//                     vtkLine aLine = new vtkLine();
-//                     aLine.GetPointIds().SetId(0, 0);
-//                     aLine.GetPointIds().SetId(1, 1);
-//                     vtkUnstructuredGrid aLineGrid = new vtkUnstructuredGrid();
-//                     aLineGrid.Allocate(1, 1);
-//                     aLineGrid.InsertNextCell(aLine.GetCellType(), aLine.GetPointIds());
-//                     aLineGrid.SetPoints(linePoints);
-//                     vtkDataSetMapper aLineMapper = new vtkDataSetMapper();
-//                     aLineMapper.SetInput(aLineGrid);
-//                     vtkActor aLineActor = new vtkActor();
-//                     aLineActor.SetMapper(aLineMapper);
-//                     aLineActor.GetProperty().SetDiffuseColor(.2, 1, 1);
-//                     
-//                 if (rayActor != null) {
-//                     panel.GetRenderer().RemoveActor(rayActor);
-//                     rayActor.Delete();
-//                 }
-//                 rayActor = aLineActor;
-//                 panel.GetRenderer().AddActor(rayActor);
-//                 
-//                 linePoints.Delete();
-//                 aLine.Delete();
-//                 aLineGrid.Delete();
-//                 aLineMapper.Delete();
-//                 panel.repaint();
-//             }
-//             
-//             private vtkActor rayActor;
-               
-               @Override
-               public boolean mouseMoved(MouseEvent e) {
-                       lastX = e.getX();
-                   lastY = e.getY();
-                   
-                   if (!panel.getComponent().isFocusControl())
-                               return false;
-                       List<vtkProp> prevHover = new ArrayList<vtkProp>();
-                       prevHover.addAll(hoverActor);
-                       hoverActor.clear();
-                       vtkProp pick[] =  panel.pick(e.getX(),e.getY());
-                       if (pick != null) {
-                               for (vtkProp p : pick)
-                                       hoverActor.add(p);
-                       }
-                               
-                       if (!prevHover.containsAll(hoverActor) || !hoverActor.containsAll(prevHover)) {
-                               fireHoverChanged();
-                       }
-                       return true;
-               }
-               
-               public List<vtkProp> getSelectActor() {
-                       return selectActors;
-               }
-               
-               public List<vtkProp> getHoverActor() {
-                       return hoverActor;
-               }
-               
-               private List<ISelectionChangedListener> selectionListeners = new ArrayList<ISelectionChangedListener>();
-                
-               @Override
-               public void addSelectionChangedListener(ISelectionChangedListener listener) {
-                       selectionListeners.add(listener);
-               }
-               
-               @Override
-               public ISelection getSelection() {
-                       return new StructuredSelection(selectActors);
-               }
-               
-               @Override
-               public void removeSelectionChangedListener(
-                               ISelectionChangedListener listener) {
-                       selectionListeners.remove(listener);
-               }
-               
-               @Override
-               public void setSelection(ISelection selection) {
-                       setSelection(selection, false);
-
-               }
-               
-               public void setSelection(ISelection selection, boolean fire) {
-                       Collection<vtkProp> selectedProps = AdaptationUtils.adaptToCollection(selection, vtkProp.class);
-                       
-                       selectActors.clear();
-                       selectActors.addAll(selectedProps);
-                       if (fire)
-                               fireSelectionChanged();
-               }
-               
-               private void fireSelectionChanged() {
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       
-                                       SelectionChangedEvent evt = new SelectionChangedEvent(vtkCameraAndSelectorAction.this, new StructuredSelection(selectActors));
-                                       for (ISelectionChangedListener l :selectionListeners) {
-                                               l.selectionChanged(evt);
-                                       }
-                                       
-                               }
-                       });
-               }
-               
-               
-               private List<ISelectionChangedListener> hoverListeners = new ArrayList<ISelectionChangedListener>();
-                
-       
-               public void addHoverChangedListener(ISelectionChangedListener listener) {
-                       hoverListeners.add(listener);
-               }
-               
-               
-               public ISelection getHoverSelection() {
-                       return new StructuredSelection(hoverActor);
-               }
-               
-               public void removeHoverChangedListener(
-                               ISelectionChangedListener listener) {
-                       hoverListeners.remove(listener);
-               }
-
-               private void fireHoverChanged() {
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       StructuredSelection sel = null;
-                                       if (hoverActor == null)
-                                               sel = new StructuredSelection();
-                                       else
-                                               sel = new StructuredSelection(hoverActor);
-                                       SelectionChangedEvent evt = new SelectionChangedEvent(vtkCameraAndSelectorAction.this, sel);
-                                       for (ISelectionChangedListener l :hoverListeners) {
-                                               l.selectionChanged(evt);
-                                       }
-                                       
-                               }
-                       });
-               }
-               
-               public void focus(double x, double y, double z) {
-                       Lock();
-                       cam.SetFocalPoint(x, y, z);
-                       if (doNotRotate)
-                       cam.SetRoll(0);
-               cam.OrthogonalizeViewUp();
-               resetCameraClippingRange();
-               //panel.UpdateLight();
-                       UnLock();
-               }
-               
-               
+
+    protected vtkRenderer ren;
+    protected int lastX;
+    protected int lastY;
+    protected vtkRenderWindow rw;
+    protected vtkCamera cam;
+    protected int InteractionMode = 1;
+
+    protected double activeRate = 5.0;
+    protected double passiveRate = 0.01;
+    protected boolean doNotRotate = true;
+
+    public vtkCameraAndSelectorAction(InteractiveVtkComposite panel) {
+        super(panel);
+        this.ren = panel.getRenderer();
+        this.rw = panel.getRenderWindow();
+        this.cam = ren.GetActiveCamera();
+    }
+
+    public void Lock() {
+        panel.lock();
+    }
+
+    public void UnLock() {
+        panel.unlock();
+    }
+
+    public void InteractionModeRotate() {
+        this.InteractionMode = 1;
+    }
+
+    public void InteractionModeTranslate() {
+        this.InteractionMode = 2;
+    }
+
+    public void InteractionModeZoom() {
+        this.InteractionMode = 3;
+    }
+
+    public void resetCameraClippingRange() {
+        Lock();
+        ren.ResetCameraClippingRange();
+        UnLock();
+    }
+
+    public void resetCamera() {
+        Lock();
+        ren.ResetCamera();
+        UnLock();
+    }
+
+    public boolean mousePressed(MouseEvent e) {
+
+        if (ren.VisibleActorCount() == 0)
+            return false;
+        rw.SetDesiredUpdateRate(activeRate);
+        lastX = e.getX();
+        lastY = e.getY();
+        if ((e.getModifiers() == InputEvent.BUTTON2_MASK)
+                || (e.getModifiers() == (InputEvent.BUTTON1_MASK | InputEvent.SHIFT_MASK))) {
+            InteractionModeTranslate();
+        } else if (e.getModifiers() == InputEvent.BUTTON3_MASK) {
+            InteractionModeZoom();
+        } else {
+            InteractionModeRotate();
+        }
+        return true;
+    }
+
+    public boolean mouseReleased(MouseEvent e) {
+        rw.SetDesiredUpdateRate(passiveRate);
+        return true;
+    }
+
+    public boolean mouseDragged(MouseEvent e) {
+        if (ren.VisibleActorCount() == 0)
+            return false;
+        int x = e.getX();
+        int y = e.getY();
+        // rotate
+        if (this.InteractionMode == 1) {
+            cam.Azimuth(lastX - x);
+            cam.Elevation(y - lastY);
+            if (doNotRotate)
+                cam.SetRoll(0);
+            cam.OrthogonalizeViewUp();
+            resetCameraClippingRange();
+            // panel.UpdateLight();
+        }
+        // translate
+        if (this.InteractionMode == 2) {
+            double FPoint[];
+            double PPoint[];
+            double APoint[] = new double[3];
+            double RPoint[];
+            double focalDepth;
+
+            // get the current focal point and position
+            FPoint = cam.GetFocalPoint();
+            PPoint = cam.GetPosition();
+
+            // calculate the focal depth since we'll be using it a lot
+            ren.SetWorldPoint(FPoint[0], FPoint[1], FPoint[2], 1.0);
+            ren.WorldToDisplay();
+            focalDepth = ren.GetDisplayPoint()[2];
+
+            APoint[0] = rw.GetSize()[0] / 2.0 + (x - lastX);
+            APoint[1] = rw.GetSize()[1] / 2.0 - (y - lastY);
+            APoint[2] = focalDepth;
+            ren.SetDisplayPoint(APoint);
+            ren.DisplayToWorld();
+            RPoint = ren.GetWorldPoint();
+            if (RPoint[3] != 0.0) {
+                RPoint[0] = RPoint[0] / RPoint[3];
+                RPoint[1] = RPoint[1] / RPoint[3];
+                RPoint[2] = RPoint[2] / RPoint[3];
+            }
+
+            /*
+             * Compute a translation vector, moving everything 1/2 the distance to the
+             * cursor. (Arbitrary scale factor)
+             */
+            cam.SetFocalPoint((FPoint[0] - RPoint[0]) / 2.0 + FPoint[0], (FPoint[1] - RPoint[1]) / 2.0 + FPoint[1],
+                    (FPoint[2] - RPoint[2]) / 2.0 + FPoint[2]);
+            cam.SetPosition((FPoint[0] - RPoint[0]) / 2.0 + PPoint[0], (FPoint[1] - RPoint[1]) / 2.0 + PPoint[1],
+                    (FPoint[2] - RPoint[2]) / 2.0 + PPoint[2]);
+            resetCameraClippingRange();
+        }
+        // zoom
+        if (this.InteractionMode == 3) {
+            double zoomFactor;
+            // double clippingRange[];
+
+            zoomFactor = Math.pow(1.02, (y - lastY));
+            if (cam.GetParallelProjection() == 1) {
+                cam.SetParallelScale(cam.GetParallelScale() / zoomFactor);
+            } else {
+                cam.Dolly(zoomFactor);
+                resetCameraClippingRange();
+            }
+        }
+        lastX = x;
+        lastY = y;
+        panel.refresh();
+        return true;
+    }
+
+    @Override
+    public boolean mouseWheelMoved(MouseWheelEvent e) {
+        double zoomFactor;
+        // double clippingRange[];
+        zoomFactor = Math.pow(1.02, (e.getWheelRotation()));
+        if (cam.GetParallelProjection() == 1) {
+            cam.SetParallelScale(cam.GetParallelScale() / zoomFactor);
+        } else {
+            cam.Dolly(zoomFactor);
+            resetCameraClippingRange();
+        }
+        panel.refresh();
+        return true;
+    }
+
+    private List<vtkProp> selectActors = new ArrayList<vtkProp>();
+    private List<vtkProp> hoverActor = new ArrayList<vtkProp>();
+
+    @Override
+    public boolean mouseClicked(MouseEvent e) {
+        if (!panel.getComponent().isFocusControl())
+            return false;
+        if (e.getButton() != MouseEvent.BUTTON1)
+            return false;
+        vtkProp spick[] = panel.pick(e.getX(), e.getY());
+        if (spick != null && spick.length > 0) {
+            for (vtkProp selectActor : spick) {
+                if (!e.isControlDown()) {
+                    selectActors.clear();
+                    selectActors.add(selectActor);
+                } else {
+                    if (selectActors.contains(selectActor))
+                        selectActors.remove(selectActor);
+                    else
+                        selectActors.add(selectActor);
+                }
+            }
+            fireSelectionChanged();
+        } else if (!e.isControlDown()) {
+            selectActors.clear();
+            fireSelectionChanged();
+        }
+        return true;
+        // if (e.getClickCount() > 1)
+        // updatePickRay(e.getX(), e.getY());
+
+    }
+
+    // private void updatePickRay(double x , double y) {
+    // Ray ray = vtkUtil.createMouseRay(panel.GetRenderer(), x, y);
+    //
+    //
+    // System.out.println(ray.pos + " " + ray.dir);
+    // vtkPoints linePoints = new vtkPoints();
+    // linePoints.InsertPoint(0,ray.pos.x, ray.pos.y, ray.pos.z);
+    // linePoints.InsertPoint(1, ray.pos.x + ray.dir.x, ray.pos.y + ray.dir.y,
+    // ray.pos.z + ray.dir.z);
+    // vtkLine aLine = new vtkLine();
+    // aLine.GetPointIds().SetId(0, 0);
+    // aLine.GetPointIds().SetId(1, 1);
+    // vtkUnstructuredGrid aLineGrid = new vtkUnstructuredGrid();
+    // aLineGrid.Allocate(1, 1);
+    // aLineGrid.InsertNextCell(aLine.GetCellType(), aLine.GetPointIds());
+    // aLineGrid.SetPoints(linePoints);
+    // vtkDataSetMapper aLineMapper = new vtkDataSetMapper();
+    // aLineMapper.SetInput(aLineGrid);
+    // vtkActor aLineActor = new vtkActor();
+    // aLineActor.SetMapper(aLineMapper);
+    // aLineActor.GetProperty().SetDiffuseColor(.2, 1, 1);
+    //
+    // if (rayActor != null) {
+    // panel.GetRenderer().RemoveActor(rayActor);
+    // rayActor.Delete();
+    // }
+    // rayActor = aLineActor;
+    // panel.GetRenderer().AddActor(rayActor);
+    //
+    // linePoints.Delete();
+    // aLine.Delete();
+    // aLineGrid.Delete();
+    // aLineMapper.Delete();
+    // panel.repaint();
+    // }
+    //
+    // private vtkActor rayActor;
+
+    @Override
+    public boolean mouseMoved(MouseEvent e) {
+        lastX = e.getX();
+        lastY = e.getY();
+
+        if (!panel.getComponent().isFocusControl())
+            return false;
+        List<vtkProp> prevHover = new ArrayList<vtkProp>();
+        prevHover.addAll(hoverActor);
+        hoverActor.clear();
+        vtkProp pick[] = panel.pick(e.getX(), e.getY());
+        if (pick != null) {
+            for (vtkProp p : pick)
+                hoverActor.add(p);
+        }
+
+        if (!prevHover.containsAll(hoverActor) || !hoverActor.containsAll(prevHover)) {
+            fireHoverChanged();
+        }
+        return true;
+    }
+
+    public List<vtkProp> getSelectActor() {
+        return selectActors;
+    }
+
+    public List<vtkProp> getHoverActor() {
+        return hoverActor;
+    }
+
+    private List<ISelectionChangedListener> selectionListeners = new ArrayList<ISelectionChangedListener>();
+
+    @Override
+    public void addSelectionChangedListener(ISelectionChangedListener listener) {
+        selectionListeners.add(listener);
+    }
+
+    @Override
+    public ISelection getSelection() {
+        return new StructuredSelection(selectActors);
+    }
+
+    @Override
+    public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+        selectionListeners.remove(listener);
+    }
+
+    @Override
+    public void setSelection(ISelection selection) {
+        setSelection(selection, false);
+
+    }
+
+    public void setSelection(ISelection selection, boolean fire) {
+        Collection<vtkProp> selectedProps = AdaptationUtils.adaptToCollection(selection, vtkProp.class);
+
+        selectActors.clear();
+        selectActors.addAll(selectedProps);
+        if (fire)
+            fireSelectionChanged();
+    }
+
+    private void fireSelectionChanged() {
+        Display.getDefault().asyncExec(new Runnable() {
+            @Override
+            public void run() {
+
+                SelectionChangedEvent evt = new SelectionChangedEvent(vtkCameraAndSelectorAction.this,
+                        new StructuredSelection(selectActors));
+                for (ISelectionChangedListener l : selectionListeners) {
+                    l.selectionChanged(evt);
+                }
+
+            }
+        });
+    }
+
+    private List<ISelectionChangedListener> hoverListeners = new ArrayList<ISelectionChangedListener>();
+
+    public void addHoverChangedListener(ISelectionChangedListener listener) {
+        hoverListeners.add(listener);
+    }
+
+    public ISelection getHoverSelection() {
+        return new StructuredSelection(hoverActor);
+    }
+
+    public void removeHoverChangedListener(ISelectionChangedListener listener) {
+        hoverListeners.remove(listener);
+    }
+
+    private void fireHoverChanged() {
+        Display.getDefault().asyncExec(new Runnable() {
+            @Override
+            public void run() {
+                StructuredSelection sel = null;
+                if (hoverActor == null)
+                    sel = new StructuredSelection();
+                else
+                    sel = new StructuredSelection(hoverActor);
+                SelectionChangedEvent evt = new SelectionChangedEvent(vtkCameraAndSelectorAction.this, sel);
+                for (ISelectionChangedListener l : hoverListeners) {
+                    l.selectionChanged(evt);
+                }
+
+            }
+        });
+    }
+
+    public void focus(double x, double y, double z) {
+        Lock();
+        cam.SetFocalPoint(x, y, z);
+        if (doNotRotate)
+            cam.SetRoll(0);
+        cam.OrthogonalizeViewUp();
+        resetCameraClippingRange();
+        // panel.UpdateLight();
+        UnLock();
+    }
+
 }
index 5aaa9c71d646c1e5d4499e6ae71b323407edb3ca..5187025fc58c88fc42fa91e81812c38537d023e3 100644 (file)
@@ -2,6 +2,7 @@ package org.simantics.plant3d.actions;
 
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseWheelEvent;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -269,4 +270,9 @@ public class AddComponentAction extends vtkSwtAction {
                } 
                return getDefaultAction().mouseClicked(e);
        }
+       
+       @Override
+       public boolean mouseWheelMoved(MouseWheelEvent e) {
+           return getDefaultAction().mouseWheelMoved(e);
+       }
 }