X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FvtkInteractorManualPaint.cpp;h=b6af3ea5366170be78d96c35361e72fbba9e7eca;hb=HEAD;hp=0a9a18f6a5437500e9990ed4dba371ff30594a70;hpb=965c602117e9de99019d49bd78ca1d707a1a6bd2;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 0a9a18f..b6af3ea 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
@@ -1,29 +1,59 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
 
 #include "vtkInteractorManualPaint.h"
 
-
 #include "wxVtk2DBaseView.h"
 #include "wxVTKRenderWindowInteractor.h"
 
-
-vtkInteractorManualPaint::vtkInteractorManualPaint(ManualPaintControler* mpc)
-{
-    _manualPaintControler   = mpc;
-	_state                  = false;
-//	_auxZ   =   0;
+vtkInteractorManualPaint::vtkInteractorManualPaint(ManualPaintControler* mpc) {
+	_manualPaintControler = mpc;
+	_state 		= false;
+	_stateKey 	= false;
+	_stateMouse = false;
 }
 
 //---------------------------------------------------------------------------
-vtkInteractorManualPaint::~vtkInteractorManualPaint()
-{
+vtkInteractorManualPaint::~vtkInteractorManualPaint() {
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnLeftButtonDown()
-{
+bool vtkInteractorManualPaint::OnChar() {
 	vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor();
-	if ( interactor->GetControlKey()==1 ){
-        _state  =   true;
+	if (interactor->GetKeyCode() == 97) {
+		_stateKey = !_stateKey;
+	}
+	return true;
+}
+
+//---------------------------------------------------------------------------
+bool vtkInteractorManualPaint::OnLeftButtonDown() {
+	vtkRenderWindowInteractor *interactor =
+			_vtkInteractorStyleBaseView->GetInteractor();
+	if (interactor->GetControlKey() == 1) {
+		_state = true;
 //        wxVtk2DBaseView             *wxvtk2Dbaseview    = (wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
 //        _Z      =   wxvtk2Dbaseview->GetActualSlice();
 	}
@@ -31,46 +61,47 @@ bool vtkInteractorManualPaint::OnLeftButtonDown()
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnLeftButtonUp()
-{
+bool vtkInteractorManualPaint::OnLeftButtonUp() {
+    if((_state == true) || (_stateKey == true))
+    	_manualPaintControler->SetImageUndo();
 	_state = false;
 	return true;
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnMouseMove ()
+bool vtkInteractorManualPaint::OnMouseMove() 
 {
-	if (_state==true)
+	if ((_state == true) || (_stateKey == true)) 
 	{
-        wxVtk2DBaseView             *wxvtk2Dbaseview    = (wxVtk2DBaseView*)_vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
-        wxVTKRenderWindowInteractor *wxVTKiren          = wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
-        int px,py;
-        wxVTKiren->GetEventPosition(px,py);
-
-        int     typeView = 2;
-        double  X        = (double)px;
-        double  Y        = (double)py;
-        double  Z        =  wxvtk2Dbaseview->GetActualSlice();
-        wxvtk2Dbaseview->TransFromCoordScreenToWorld(X, Y, Z,false, typeView);
+		wxVtk2DBaseView *wxvtk2Dbaseview =
+				(wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
+		wxVTKRenderWindowInteractor *wxVTKiren =
+				wxvtk2Dbaseview->GetWxVTKRenderWindowInteractor();
+		int px, py;
+		wxVTKiren->GetEventPosition(px, py);
 
-//        int px = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[0];
-//        int py = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[1];
+//        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);
+		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();
-*/
-	}// if _state
+		/*
+		 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();
+		 */
+	} // if _state
 	return true;
 }
 
-