X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FBrushFilter.cpp;h=3e14f4c84159bfed5a2b92d9c3f90cc32f859631;hb=15112ae15da4222831b0e8e7c9be87daf9e99a1c;hp=ce9bf014a21137341eb0afecd7bb51d6f0b24824;hpb=439cc05f12e61d0ba090ec0c2ba8701d382238d7;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 ce9bf01..3e14f4c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -25,8 +25,9 @@
 
 #include "BrushFilter.h"
 
-BrushFilter::BrushFilter() {
-	_brushsize = 1;
+BrushFilter::BrushFilter() 
+{
+	_brushsize = 5;
 	_brushform = 0; // 0 rectangle-cube  ,   1 circle-sphere
 	_brushtool = 0; // 0 pencil         ,   1 fill
 }
@@ -37,117 +38,147 @@ BrushFilter::~BrushFilter() // virtual
 }
 
 //---------------------------------------------------------------------------
-void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY,
-		int &minZ, int &maxZ, int &size) {
+void BrushFilter::FindMinMaxBrush(int px, int py, int pz,int &minX, int &maxX, int &minY, int &maxY,
+		int &minZ, int &maxZ, int &size) 
+{
 	size = _brushsize - 1;
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+/*
 	minX = _px - size;
 	maxX = _px + size;
 	minY = _py - size;
 	maxY = _py + size;
 	minZ = _pz - size;
 	maxZ = _pz + size;
-
 	if (_2D3D == 0) //2D
-			{
+	{
 		if (_direction == 0) // YZ
-				{
+		{
 			minX = _px;
 			maxX = _px;
 		}
 		if (_direction == 1) // XZ
-				{
+		{
 			minY = _py;
 			maxY = _py;
 		}
 		if (_direction == 2) // XY
-				{
+		{
 			minZ = _pz;
 			maxZ = _pz;
 		}
-	}
-
-	if (_2D3D == 1) // 3D
-			{
-	}
-
-	if (minX < _minX) {
-		minX = _minX;
-	}
-
-	if (minY < _minY) {
-		minY = _minY;
-	}
-
-	if (minZ < _minZ) {
-		minZ = _minZ;
-	}
+	} // _2D3D
+*/
+	minX = px - size;
+	maxX = px + size;
+	minY = py - size;
+	maxY = py + size;
+	minZ = pz - size;
+	maxZ = pz + size;
+	if (_2D3D == 0) //2D
+	{
+		if (_direction == 0) // YZ
+		{
+			minX = px;
+			maxX = px;
+		}
+		if (_direction == 1) // XZ
+		{
+			minY = py;
+			maxY = py;
+		}
+		if (_direction == 2) // XY
+		{
+			minZ = pz;
+			maxZ = pz;
+		}
+	} // _2D3D
 
-	if (maxX > _maxX) {
-		maxX = _maxX;
-	}
+	if (_2D3D == 1) {  }  // 3D 
 
-	if (maxY > _maxY) {
-		maxY = _maxY;
-	}
+	if (minX < _minX) { minX = _minX; }
+	if (minY < _minY) { minY = _minY; }
+	if (minZ < _minZ) { minZ = _minZ; }
 
-	if (maxZ > _maxZ) {
-		maxZ = _maxZ;
-	}
+	if (maxX >= _dimX) { maxX = _dimX-1; }
+	if (maxY >= _dimY) { maxY = _dimY-1; }
+ 	if (maxZ >= _dimZ) { maxZ = _dimZ-1; }
 
-	//--
-	SetGeneralMinMax(minX, maxX, minY, maxY, minZ, maxZ);
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//	SetGeneralMinMax(minX, maxX, minY, maxY, minZ, maxZ);
 }
 
 //---------------------------------------------------------------------------
-void BrushFilter::Run() // virtual
+void BrushFilter::Run(int px, int py, int pz) // virtual
 {
 	if (_image != NULL)
 	{
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//		this->_IMManager->BaseInitialPoint(_px, _py ,_pz);
+		this->_IMManager->BaseInitialPoint(px, py ,pz);
+
 		float value = (float) _graylevel;
 		int i, j, k;
 
 		int size;
 		int minX, maxX, minY, maxY, minZ, maxZ;
-		FindMinMaxBrush(minX, maxX, minY, maxY, minZ, maxZ, size);
+		FindMinMaxBrush(px,py,pz,minX, maxX, minY, maxY, minZ, maxZ, size);
 
 		double xx, yy, zz, rr = size * size;
-
-printf("EED BrushFilter::Run() %d  %d\n", _RangeMin, _RangeMax);
-
-		for (i = minX; i <= maxX; i++) {
-			xx = _px - i;
+		float scalarComponent;
+		bool pixelModify;
+
+		for (i = minX; i <= maxX; i++) 
+		{
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//			xx = _px - i;  
+			xx = px - i;  
 			xx = xx * xx;
-			for (j = minY; j <= maxY; j++) {
-				yy = _py - j;
+			for (j = minY; j <= maxY; j++) 
+			{
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//				yy = _py - 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 ((_RangeMin <= scalarComponent)
-							&& (scalarComponent <= _RangeMax )) {
+				for (k = minZ; k <= maxZ; k++) 
+				{
+					pixelModify=false;
+					scalarComponent = _image->GetScalarComponentAsFloat(i,j, k, 0);
+					if ((_RangeMin <= scalarComponent) && (scalarComponent <= _RangeMax )) 
+					{
 						if (_brushform == 0) 
 						{
-							this->_IMManager->AddModifiedPixel(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 0
 						if (_brushform == 1) 
 						{
-							zz = _pz - k;
+//EED 2020-04-28  BORRAME Change to local variables to use with openmp
+//							zz = _pz - k;
+							zz = pz - k;
 							zz = zz * zz;
 							if ((xx + yy + zz) <= rr) {
-								this->_IMManager->AddModifiedPixel(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 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(
@@ -156,37 +187,21 @@ printf("EED BrushFilter::Run() %d  %d\n", _RangeMin, _RangeMax);
 }
 
 //---------------------------------------------------------------------------
-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;
-}