X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FvtkInteractorManualPaint.cpp;h=ae4e8b99052e791c09db49f633c8495dcdcb2dfe;hb=ca35b13e046343c8b50cbd6b833828b06c9d1608;hp=b6af3ea5366170be78d96c35361e72fbba9e7eca;hpb=0780b53e8b105636030b2c9fcbbc423d8ed48c30;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
index b6af3ea..ae4e8b9 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
@@ -26,30 +26,35 @@
 #include "vtkInteractorManualPaint.h"
 
 #include "wxVtk2DBaseView.h"
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 
-vtkInteractorManualPaint::vtkInteractorManualPaint(ManualPaintControler* mpc) {
-	_manualPaintControler = mpc;
-	_state 		= false;
-	_stateKey 	= false;
-	_stateMouse = false;
+vtkInteractorManualPaint::vtkInteractorManualPaint(ManualPaintControler* mpc) 
+{
+	_manualPaintControler 	= mpc;
+	_state 					= false;
+	_stateKey 				= false;
+	_stateMouse 			= false;
 }
 
 //---------------------------------------------------------------------------
-vtkInteractorManualPaint::~vtkInteractorManualPaint() {
+vtkInteractorManualPaint::~vtkInteractorManualPaint() 
+{
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnChar() {
+bool vtkInteractorManualPaint::OnChar() 
+{
 	vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor();
-	if (interactor->GetKeyCode() == 97) {
+	if (interactor->GetKeyCode() == 97) 
+	{
 		_stateKey = !_stateKey;
 	}
 	return true;
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnLeftButtonDown() {
+bool vtkInteractorManualPaint::OnLeftButtonDown() 
+{
 	vtkRenderWindowInteractor *interactor =
 			_vtkInteractorStyleBaseView->GetInteractor();
 	if (interactor->GetControlKey() == 1) {
@@ -61,9 +66,12 @@ bool vtkInteractorManualPaint::OnLeftButtonDown() {
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnLeftButtonUp() {
+bool vtkInteractorManualPaint::OnLeftButtonUp() 
+{
     if((_state == true) || (_stateKey == true))
+	{
     	_manualPaintControler->SetImageUndo();
+	}
 	_state = false;
 	return true;
 }
@@ -75,7 +83,7 @@ bool vtkInteractorManualPaint::OnMouseMove()
 	{
 		wxVtk2DBaseView *wxvtk2Dbaseview =
 				(wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
-		wxVTKRenderWindowInteractor *wxVTKiren =
+		crea::wxVTKRenderWindowInteractor *wxVTKiren =
 				wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
 		int px, py;
 		wxVTKiren->GetEventPosition(px, py);