2345 creaMaracasVisu Feature Test Phase Normal Ruler01XY

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
index eec9a1ba950f10f90f6d2911e20d82f130cca1a9..ac69465260736205c291c5a5c9ad1b8fead13e72 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/ManualPaintModel.cpp
@@ -1,28 +1,71 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "ManualPaintModel.h"
 
 ManualPaintModel::ManualPaintModel() {
-       _tool = 0; // 0 pencil         ,   1 fill
-       _brushfilter = new BrushFilter();
-       _fillfilter = new FillFilter();
-       _imageUndoRedo = new ImageUndoRedo();
+       _active         = true;
+       _tool           = 0; // 0 pencil         ,   1 fill
+       _brushfilter    = new BrushFilter();
+       _fillfilter     = new FillFilter();
+       _imageUndoRedo  = new ImageUndoRedo();
 }
 
 //---------------------------------------------------------------------------
-ManualPaintModel::~ManualPaintModel() {
+ManualPaintModel::~ManualPaintModel() 
+{
        delete _brushfilter;
        delete _fillfilter;
 }
 
+
+//---------------------------------------------------------------------------
+void ManualPaintModel::SetActive( bool active )
+{
+  _active = active;
+}
+
 //---------------------------------------------------------------------------
-void ManualPaintModel::PaintImage(int px, int py, int pz) {
-       if (_tool == 0) {
+void ManualPaintModel::PaintImage(int px, int py, int pz) 
+{
+printf("EED   ManualPaintModel::PaintImage\n");
+  if (_active==true)
+  {
+
+       if (_tool == 0) 
+       {
                _brushfilter->SetPoint(px, py, pz);
                _brushfilter->Run();
-       }
-       if (_tool == 1) {
+       } // _tool 2
+
+       if (_tool == 1) 
+       {
                _fillfilter->SetPoint(px, py, pz);
                _fillfilter->Run();
-       }
+       } // _tool 1
+  } // _active
 }
 
 //---------------------------------------------------------------------------
@@ -93,18 +136,22 @@ void ManualPaintModel::GetScalarRange(double * range) {
 //---------------------------------------------------------------------------
 void ManualPaintModel::SetUndoImage() {
        ImageMManager* imMManager = NULL;
-       if (_tool == 0) {
-               imMManager = this->_brushfilter->GetImageMManager();
-       }
-       if (_tool == 1) {
-               imMManager = this->_fillfilter->GetImageMManager();
-       }
-       this->_imageUndoRedo->SetUndoImage(imMManager);
-       this->_brushfilter->CleanImageMManager();
-       this->_fillfilter->CleanImageMManager();
+        if (_tool == 0) {
+        imMManager = this->_brushfilter->GetImageMManager();
+        }
+        if (_tool == 1) {
+        imMManager = this->_fillfilter->GetImageMManager();
+        }
+        this->_imageUndoRedo->SetURImages(imMManager);
+        this->_brushfilter->CleanImageMManager();
+        this->_fillfilter->CleanImageMManager();
 }
 //---------------------------------------------------------------------------
 
 void ManualPaintModel::Undo() {
        this->_imageUndoRedo->Undo();
 }
+
+void ManualPaintModel::Redo() {
+       this->_imageUndoRedo->Redo();
+}