X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FvtkInteractorManualPaint.cpp;h=609acfe51020464111eacd4572f98761f6fd3eb3;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=ae4e8b99052e791c09db49f633c8495dcdcb2dfe;hpb=b6368e519e4fc1e5df411489848e54d4e26bf4ec;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 ae4e8b9..609acfe 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
@@ -55,12 +55,11 @@ bool vtkInteractorManualPaint::OnChar()
 //---------------------------------------------------------------------------
 bool vtkInteractorManualPaint::OnLeftButtonDown() 
 {
-	vtkRenderWindowInteractor *interactor =
-			_vtkInteractorStyleBaseView->GetInteractor();
+	vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor();
 	if (interactor->GetControlKey() == 1) {
 		_state = true;
-//        wxVtk2DBaseView             *wxvtk2Dbaseview    = (wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
-//        _Z      =   wxvtk2Dbaseview->GetActualSlice();
+//      wxVtk2DBaseView             *wxvtk2Dbaseview    = (wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
+//      _Z      =   wxvtk2Dbaseview->GetActualSlice();
 	}
 	return true;
 }
@@ -70,7 +69,7 @@ bool vtkInteractorManualPaint::OnLeftButtonUp()
 {
     if((_state == true) || (_stateKey == true))
 	{
-    	_manualPaintControler->SetImageUndo();
+//    	_manualPaintControler->SetImageUndo();
 	}
 	_state = false;
 	return true;
@@ -81,34 +80,17 @@ bool vtkInteractorManualPaint::OnMouseMove()
 {
 	if ((_state == true) || (_stateKey == true)) 
 	{
-		wxVtk2DBaseView *wxvtk2Dbaseview =
-				(wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
-		crea::wxVTKRenderWindowInteractor *wxVTKiren =
-				wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
+		wxVtk2DBaseView 					*wxvtk2Dbaseview 	= (wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
+		crea::wxVTKRenderWindowInteractor 	*wxVTKiren 			= wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
 		int px, py;
 		wxVTKiren->GetEventPosition(px, py);
-
-//        int     typeView = 1;
 		double X = (double) px;
 		double Y = (double) py;
 		double Z = wxvtk2Dbaseview->GetActualSlice();
-//        wxvtk2Dbaseview->TransFromCoordScreenToWorld(X, Y, Z,true, typeView);
 		wxvtk2Dbaseview->TransFromCoordScreenToWorld(X, Y, Z, true);
-
-		_manualPaintControler->PaintImage((int) X, (int) Y, (int) Z);
+		_manualPaintControler->PaintImage((int) X, (int) Y, (int) Z,  wxvtk2Dbaseview->GetDirection() );
 		this->_vtkInteractorStyleBaseView->SetParent_refresh_waiting();
-
-		/*
-		 wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->Modified();
-		 wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetImageActor()->Modified();
-		 wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetImageActor()->SetDisplayExtent(0, 50+_auxZ, 0, 50,_Z, _Z );
-		 wxvtk2Dbaseview->Refresh();
-		 wxvtk2Dbaseview->RefreshView();
-		 //        wxvtk2Dbaseview->SetActualSlice(_Z+_auxZ);
-		 _auxZ=(_auxZ+1)%2;
-		 wxvtk2Dbaseview->_imageViewer2XYZ->GetVtkImageViewer2()->GetRenderer()->Render();
-		 this->_vtkInteractorStyleBaseView->SetParent_refresh_waiting();
-		 */
+    	_manualPaintControler->SetImageUndo();
 	} // if _state
 	return true;
 }