X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FBrushFilter.cpp;h=7e5e76e053466852b97501e80cf761cc407893a3;hb=7d08401d8ffee17aaf47ff6ee83161cbaa1f10b9;hp=bdbd267d4bdc75a3424c09640b00b6e91342c9b5;hpb=b37bd791f88bd4c1a6146fadcb88864d7cd1a5c3;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
index bdbd267..7e5e76e 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.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 "BrushFilter.h"
 
 BrushFilter::BrushFilter() {
 	_brushsize = 1;
-	_brushform = 0; // 0 rectangle-box  ,   1 circle-sphere
+	_brushform = 0; // 0 rectangle-cube  ,   1 circle-sphere
 	_brushtool = 0; // 0 pencil         ,   1 fill
 }
 
@@ -76,10 +101,12 @@ void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY,
 //---------------------------------------------------------------------------
 void BrushFilter::Run() // virtual
 {
+
+printf("EED nBrushFilter::Run  _RangeMax %d \n",_RangeMax);
+
 	if (_image != NULL)
 	{
 		float value = (float) _graylevel;
-		this->_MRegion->value = (float) _graylevel;
 		int i, j, k;
 
 		int size;
@@ -87,41 +114,55 @@ void BrushFilter::Run() // virtual
 		FindMinMaxBrush(minX, maxX, minY, maxY, minZ, maxZ, size);
 
 		double xx, yy, zz, rr = size * size;
+		float scalarComponent;
+		bool pixelModify;
 
-		for (i = minX; i <= maxX; i++) {
+		for (i = minX; i <= maxX; i++) 
+		{
 			xx = _px - i;
 			xx = xx * xx;
-			for (j = minY; j <= maxY; j++) {
+			for (j = minY; j <= maxY; j++) 
+			{
 				yy = _py - j;
 				yy = yy * yy;
-				for (k = minZ; k <= maxZ; k++) {
-//                    if ((i>=_minX) && (i<=_maxX) && (j>=_minY) && (j<=_maxY) && (k>=_minZ) && (k<=_maxZ))
-//                    {
-
-					float scalarComponent = _image->GetScalarComponentAsFloat(i,
-							j, k, 0);
-					if ((this->GetRangeMin() <= scalarComponent)
-							&& (scalarComponent <= this->GetRangeMax())) {
-						zz = _pz - k;
-						zz = zz * zz;
-						if (_brushform == 0) {
-							this->CalculateMinMaxRegion(i, j, k); //DFCH
-							_image->SetScalarComponentFromFloat(i, j, k, 0,
-									value);
-						} else if (_brushform == 1) {
+				for (k = minZ; k <= maxZ; k++) 
+				{
+					pixelModify=false;
+					scalarComponent = _image->GetScalarComponentAsFloat(i,j, k, 0);
+					if ((_RangeMin <= scalarComponent)
+							&& (scalarComponent <= _RangeMax )) 
+					{
+						if (_brushform == 0) 
+						{
+							pixelModify=true;
+//							this->_IMManager->AddModifiedPixel(i, j, k); //DFCH
+//							_image->SetScalarComponentFromFloat(i, j, k, 0,value);
+						} // _brushform 0
+						if (_brushform == 1) 
+						{
+							zz = _pz - k;
+							zz = zz * zz;
 							if ((xx + yy + zz) <= rr) {
-								this->CalculateMinMaxRegion(i, j, k); //DFCH
-								_image->SetScalarComponentFromFloat(i, j, k, 0,
-										value);
+								pixelModify=true;
+//								this->_IMManager->AddModifiedPixel(i, j, k); //DFCH
+//								_image->SetScalarComponentFromFloat(i, j, k, 0,value);
 							}
-						} // _brushform
+						} // _brushform 1
+						if (pixelModify==true)
+						{
+								this->_IMManager->AddModifiedPixel(i, j, k); //DFCH
+								if (_image2!=NULL)
+								{
+									_image2->SetScalarComponentFromFloat(i, j, k, 0,value);
+								}else {
+									_image->SetScalarComponentFromFloat(i, j, k, 0,value);
+								}
+						} // if pixelModify
 					} //   GetRangeMin && GetRangeMax
 
-//                    } //if _minX _maxX _minY _maxY _minZ _maxZ
-
-				} //k
-			} //j
-		} //i
+				} //for k
+			} //for j
+		} //for i
 		_image->Modified();
 	} else {
 		printf(
@@ -130,37 +171,21 @@ void BrushFilter::Run() // virtual
 }
 
 //---------------------------------------------------------------------------
-void BrushFilter::SetBrushSize(int brushsize) {
+void BrushFilter::SetBrushSize(int brushsize) 
+{
 	_brushsize = brushsize;
 }
 
 //---------------------------------------------------------------------------
-void BrushFilter::SetBrushForm(int brushform) {
+void BrushFilter::SetBrushForm(int brushform) 
+{
 	_brushform = brushform;
 }
 
 //---------------------------------------------------------------------------
-void BrushFilter::SetBrushTool(int brushtool) {
+void BrushFilter::SetBrushTool(int brushtool) 
+{
 	_brushtool = brushtool;
 }
 
-//---------------------------------------------------------------------------
-void BrushFilter::SetRangeMin(int min) {
-	_RangeMin = min;
-}
-
-//---------------------------------------------------------------------------
-void BrushFilter::SetRangeMax(int max) {
-	_RangeMax = max;
-}
-
-//---------------------------------------------------------------------------
-int BrushFilter::GetRangeMin() {
-	return (_RangeMin);
-}
-
-//---------------------------------------------------------------------------
-int BrushFilter::GetRangeMax() {
-	return (_RangeMax);
-}