#2855 creaMaracasVisu Bug New Normal - ColorLayer box spacing size not identified

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualPaint / vtkInteractorManualPaint.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/vtkInteractorManualPaint.cpp
index a1483399af7dc726e4644232b9fd2ebb8ef78855..b6af3ea5366170be78d96c35361e72fbba9e7eca 100644 (file)
--- 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"
@@ -5,8 +30,9 @@
 
 vtkInteractorManualPaint::vtkInteractorManualPaint(ManualPaintControler* mpc) {
        _manualPaintControler = mpc;
-       _state = false;
-       _stateKey = false;
+       _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,14 +62,17 @@ bool vtkInteractorManualPaint::OnLeftButtonDown() {
 
 //---------------------------------------------------------------------------
 bool vtkInteractorManualPaint::OnLeftButtonUp() {
-       _manualPaintControler->SetImageUndo();
+    if((_state == true) || (_stateKey == true))
+       _manualPaintControler->SetImageUndo();
        _state = false;
        return true;
 }
 
 //---------------------------------------------------------------------------
-bool vtkInteractorManualPaint::OnMouseMove() {
-       if ((_state == true) || (_stateKey == true)) {
+bool vtkInteractorManualPaint::OnMouseMove() 
+{
+       if ((_state == true) || (_stateKey == true)) 
+       {
                wxVtk2DBaseView *wxvtk2Dbaseview =
                                (wxVtk2DBaseView*) _vtkInteractorStyleBaseView->GetWxVtk2DBaseView();
                wxVTKRenderWindowInteractor *wxVTKiren =