X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FvtkInteractorManualPaint.cpp;h=f3279364f1e43cc03019a1fa4a5393a32375d214;hb=9a8f7c9cb08ffcb57f1558b9d20f7fbcd95df017;hp=122eccf2f9e551153215930e6f93b248b0e47f34;hpb=2c09a61fc7d7695eebf8ca886fb8cd727afccc09;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 122eccf..f327936 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
@@ -26,32 +26,37 @@
 #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() 
+{
+printf("EED vtkInteractorManualPaint::OnChar \n");
 	vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor();
-	if (interactor->GetKeyCode() == 97) {
+	if (interactor->GetKeyCode() == 97) 
+	{
 		_stateKey = !_stateKey;
 	}
 	return true;
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnLeftButtonDown() {
-	vtkRenderWindowInteractor *interactor =
-			_vtkInteractorStyleBaseView->GetInteractor();
+bool vtkInteractorManualPaint::OnLeftButtonDown() 
+{
+	vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor();
 	if (interactor->GetControlKey() == 1) {
 		_state = true;
 //        wxVtk2DBaseView             *wxvtk2Dbaseview    = (wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
@@ -61,9 +66,13 @@ bool vtkInteractorManualPaint::OnLeftButtonDown() {
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnLeftButtonUp() {
+bool vtkInteractorManualPaint::OnLeftButtonUp() 
+{
+printf("EED vtkInteractorManualPaint::OnLeftButtonUp \n");
     if((_state == true) || (_stateKey == true))
+	{
     	_manualPaintControler->SetImageUndo();
+	}
 	_state = false;
 	return true;
 }
@@ -71,11 +80,11 @@ bool vtkInteractorManualPaint::OnLeftButtonUp() {
 //---------------------------------------------------------------------------
 bool vtkInteractorManualPaint::OnMouseMove() 
 {
-printf("EED vtkInteractorManualPaint::OnMouseMove \n");
-	if ((_state == true) || (_stateKey == true)) {
+	if ((_state == true) || (_stateKey == true)) 
+	{
 		wxVtk2DBaseView *wxvtk2Dbaseview =
 				(wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
-		wxVTKRenderWindowInteractor *wxVTKiren =
+		crea::wxVTKRenderWindowInteractor *wxVTKiren =
 				wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
 		int px, py;
 		wxVTKiren->GetEventPosition(px, py);
@@ -87,7 +96,6 @@ printf("EED vtkInteractorManualPaint::OnMouseMove \n");
 //        wxvtk2Dbaseview->TransFromCoordScreenToWorld(X, Y, Z,true, typeView);
 		wxvtk2Dbaseview->TransFromCoordScreenToWorld(X, Y, Z, true);
 
-printf("EED vtkInteractorManualPaint::OnMouseMove A  %d %d %d\n", (int) X, (int) Y, (int) Z);
 		_manualPaintControler->PaintImage((int) X, (int) Y, (int) Z);
 		this->_vtkInteractorStyleBaseView->SetParent_refresh_waiting();