DFCH: imageUndoRedo + Manual Paint: It doesn't works :s :s

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / vtkInteractorStyleBaseView3D.cxx

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
index 0b2e7c2265d638a366d3eda0e831bd10b812452c..067ceb91c0bc842400221c19aa2694cb4f2793cd 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView3D.cxx
@@ -103,8 +103,9 @@ void  vtkInteractorStyleBaseView3D::OnMouseMove ()
 
 }
 //---------------------------------------------------------------------------
-void  vtkInteractorStyleBaseView3D::OnLeftButtonDown ()
+void vtkInteractorStyleBaseView3D::OnLeftButtonDown()
 {
+//     printf("EED creaMaracasVisu::vtkInteractorStyleBaseView3D::OnLeftButtonDown \n");
        vtkInteractorStyleBaseView::OnLeftButtonDown();
 /*
                if (GetInteractor()->GetControlKey()==1 ){
@@ -122,12 +123,22 @@ void  vtkInteractorStyleBaseView3D::OnLeftButtonDown ()
     return;
     }
 
+       
+       if ((GetInteractor()->GetControlKey()==0) && (GetInteractor()->GetShiftKey()==1) )
+       {
+               this->vtkInteractorStyleImage::OnLeftButtonDown();
+       }
+       
+       
   if (this->Interactor->GetControlKey()) {
       this->StartPan();
   } else {
       this->StartRotate();
   }
 
+       
+       
+
  /* 
   if (this->Interactor->GetShiftKey()) 
     {
@@ -192,3 +203,24 @@ void  vtkInteractorStyleBaseView3D::OnMiddleButtonUp ()
 
        //              this->vtkInteractorStyleTrackballCamera::OnMiddleButtonUp();
 }
+
+
+//---------------------------------------------------------------------------
+void vtkInteractorStyleBaseView3D::OnMouseWheelForward () // virtual
+{
+       vtkInteractorStyleBaseView::OnMouseWheelForward();      
+       if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) )
+       {
+               this->vtkInteractorStyleImage::OnMouseWheelForward();
+       }
+}
+
+//---------------------------------------------------------------------------
+void vtkInteractorStyleBaseView3D::OnMouseWheelBackward () // virtual
+{
+       vtkInteractorStyleBaseView::OnMouseWheelBackward();     
+       if ((GetInteractor()->GetControlKey()==0) || (GetInteractor()->GetShiftKey()==0) )
+       {
+               this->vtkInteractorStyleImage::OnMouseWheelBackward();
+       }
+}