no message

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx
index d748d073f6f56d5928f2170ec0e526f0efb24002..ed0d861c1d10f070a8c522e00f876377f0e16736 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx
@@ -90,12 +90,6 @@ bool InteractorStyleMaracas::OnRightDClick() //virtual
 }
 
 
-//EED ?????  27Juillet2011     
-//---------------------------------------------------------------------------
-bool InteractorStyleMaracas::OnMouseWheel() //virtual
-{
-       return true;
-}
 
 //---------------------------------------------------------------------------
 bool InteractorStyleMaracas::OnMouseWheelForward() //virtual

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
index 863e017746fa55c8a6e06b1f4732f4453447b68d..31f791f7792f4ec8e0f68c53e76ff6f6d8238b34 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.h
@@ -32,10 +32,7 @@ public:
        virtual bool  OnLeftDClick();
        virtual bool  OnRightDClick();   
        virtual bool  OnMiddleDClick();  
-       
-//EED ?????  27Juillet2011     
-       virtual bool  OnMouseWheel();    
-       
+               
        virtual bool  OnMouseWheelForward();
        virtual bool  OnMouseWheelBackward();
        

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
index 89aee7044a585291e338a9306db000adccbc0f12..012e2d9a46f4e1b65101660a93a4c3636756b6c2 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx
@@ -78,23 +78,15 @@ void vtkInteractorStyleBaseView::OnRightDClick()  // virtual
 {
        CallLstInteractorStyleMaracas( 12 );
 }
-//---------------------------------------------------------------------------
-//EED27Juillet2011
-void vtkInteractorStyleBaseView::OnMouseWheel()  // virtual
-{
-       printf("EED vtkInteractorStyleBaseView::OnMouseWheel\n");
-       CallLstInteractorStyleMaracas( 14 );
-}
+
 
 void  vtkInteractorStyleBaseView::OnMouseWheelForward()  // virtual
 {
-       printf("EED.. vtkInteractorStyleBaseView::OnMouseWheelForward\n");
        CallLstInteractorStyleMaracas( 15 );
 }
 
 void vtkInteractorStyleBaseView::OnMouseWheelBackward() // virtual
 {
-       printf("EED.. vtkInteractorStyleBaseView::OnMouseWheelBackward\n");
        CallLstInteractorStyleMaracas( 16 );
 }
 
@@ -236,15 +228,7 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type)
                                        i=size;
                                }
                        }
-                       
-                       //EED ?????  27Juillet2011      
-                       if (type==14)
-                       {  // OnMouseWheel
-                               if (intStyMar->OnMouseWheel()==false)
-                               {
-                                       i=size;
-                               }
-                       }
+                       // 14 ... old OnMouseWheelFordward
                        if (type==15)
                        {  // OnMouseWheelForward
                                if (intStyMar->OnMouseWheelForward()==false)

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.h
index 8687dc8e818bac2085de83bdcca6d56e37374406..42aff6492b48fccfa75bab117754aa76f99b2f21 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.h
@@ -31,8 +31,6 @@ public:
        virtual void  OnMiddleDClick();
        
 
-       virtual void  OnMouseWheel();
-       
        virtual void  OnMouseWheelForward();
        virtual void  OnMouseWheelBackward();
 

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.cxx
index 3b67abc55064a0fff93fc7f7bc6bfc9ab79f11fc..dc38c19eff1b0db520d56bc7bbb34e7093c4e46c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVTKRenderWindowInteractorPlus.cxx
@@ -72,11 +72,6 @@ void wxVTKRenderWindowInteractorPlus::OnMouseWheel( wxMouseEvent& event )
        _wxvtkbaseview->GetInteractorStyleBaseView()->OnMouseWheel();
        */
        
-       
-//EED ????  this is just a maracasvisu EED old mechanism to be erased ..
-       ((vtkInteractorStyleBaseView*)_wxvtkbaseview->GetInteractorStyleBaseView())->OnMouseWheel();
-       
-       
        if(event.GetWheelRotation() > 0)
     {
                //Send event to VTK