X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FvtkInteractorManualPaint.cpp;h=122eccf2f9e551153215930e6f93b248b0e47f34;hb=7d08401d8ffee17aaf47ff6ee83161cbaa1f10b9;hp=0b607c2311345d98c9cab59e2c980e30a2cbbf92;hpb=8138ced89fa9f1cc6933ff739dfa28b1e3c3883b;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 0b607c2..122eccf 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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"
@@ -7,6 +32,7 @@ vtkInteractorManualPaint::vtkInteractorManualPaint(ManualPaintControler* mpc) {
 	_manualPaintControler = mpc;
 	_state = false;
 	_stateKey = false;
+	_stateMouse = false;
 }
 
 //---------------------------------------------------------------------------
@@ -15,9 +41,7 @@ vtkInteractorManualPaint::~vtkInteractorManualPaint() {
 
 //---------------------------------------------------------------------------
 bool vtkInteractorManualPaint::OnChar() {
-	vtkRenderWindowInteractor *interactor =
-			_vtkInteractorStyleBaseView->GetInteractor();
-
+	vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor();
 	if (interactor->GetKeyCode() == 97) {
 		_stateKey = !_stateKey;
 	}
@@ -38,13 +62,16 @@ bool vtkInteractorManualPaint::OnLeftButtonDown() {
 
 //---------------------------------------------------------------------------
 bool vtkInteractorManualPaint::OnLeftButtonUp() {
-	//_manualPaintControler->SetImageUndo();
+    if((_state == true) || (_stateKey == true))
+    	_manualPaintControler->SetImageUndo();
 	_state = false;
 	return true;
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnMouseMove() {
+bool vtkInteractorManualPaint::OnMouseMove() 
+{
+printf("EED vtkInteractorManualPaint::OnMouseMove \n");
 	if ((_state == true) || (_stateKey == true)) {
 		wxVtk2DBaseView *wxvtk2Dbaseview =
 				(wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
@@ -60,6 +87,7 @@ bool vtkInteractorManualPaint::OnMouseMove() {
 //        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();