Merge remote-tracking branch 'refs/remotes/origin/master'

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
index 80dbcc4a8d8f99ebeabaa54615f7608e4bef8bbb..f326ff525e2820fe53208d728d9111e392ad1b56 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/baseFilterManualPaint.cpp
@@ -1,8 +1,33 @@
+/*# ---------------------------------------------------------------------
+#
+# 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 "baseFilterManualPaint.h"
 
 baseFilterManualPaint::baseFilterManualPaint() {
-       //_MRegion = new RegionStructUR();
-       //CleanModifiedRegion();
+       _IMManager = new ImageMManager();
+       _IMManager->CleanModifiedRegion();
        _graylevel = 0.0;
        _2D3D = 1; // 0 2D             ,   1 true 3D
        _direction = 0; // 1 XZ             ,   0 YZ            ,   2 XY
@@ -109,35 +134,11 @@ void baseFilterManualPaint::SetGeneralMinMax(int minX, int maxX, int minY,
 void baseFilterManualPaint::GetScalarRange(double * range) {
        range = this->_image->GetScalarRange();
 }
-/*
-RegionStructUR* baseFilterManualPaint::GetModifiedRegion() {
-       return (this->_MRegion);
+
+ImageMManager* baseFilterManualPaint::GetImageMManager() {
+       return (this->_IMManager);
 } //DFCH
-void baseFilterManualPaint::CleanModifiedRegion() {
-       this->_MRegion->minX = 0;
-       this->_MRegion->maxX = 0;
-       this->_MRegion->minY = 0;
-       this->_MRegion->maxY = 0;
-       this->_MRegion->minZ = 0;
-       this->_MRegion->maxZ = 0;
+void baseFilterManualPaint::CleanImageMManager() {
+       this->_IMManager->CleanModifiedRegion();
 } //DFCH
-void baseFilterManualPaint::CalculateMinMaxRegion(const int& i, const int& j,
-               const int& k) {
-       if (i < this->_MRegion->minX) {
-               this->_MRegion->minX = i;
-       } else {
-               this->_MRegion->maxX = i;
-       } //fi
-       if (j < this->_MRegion->minY) {
-               this->_MRegion->minY = j;
-       } else {
-               this->_MRegion->maxY = j;
-       } //fi
-       if (k < this->_MRegion->minZ) {
-               this->_MRegion->minZ = k;
-       } else {
-               this->_MRegion->maxZ = k;
-       } //fi
-}
-*/