From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Wed, 3 Aug 2011 09:45:13 +0000 (+0000)
Subject: no message
X-Git-Tag: v1.0.4~69
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7e5ab7e1d960ec10b6ce7ec31f1cc3f62c8d515d;p=creaMaracasVisu.git

no message
---

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/InteractorStyleMaracas.cxx
index d748d07..ed0d861 100644
--- 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 863e017..31f791f 100644
--- 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 89aee70..012e2d9 100644
--- 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 8687dc8..42aff64 100644
--- 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 3b67abc..dc38c19 100644
--- 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