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=3085a209b22683f968a0f910885bd5f6e32ab43f;hpb=9a8f7c9cb08ffcb57f1558b9d20f7fbcd95df017;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 3085a20..3e14f4c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/BrushFilter.cpp
@@ -27,7 +27,7 @@
 
 BrushFilter::BrushFilter() 
 {
-	_brushsize = 1;
+	_brushsize = 5;
 	_brushform = 0; // 0 rectangle-cube  ,   1 circle-sphere
 	_brushtool = 0; // 0 pencil         ,   1 fill
 }
@@ -38,79 +38,91 @@ BrushFilter::~BrushFilter() // virtual
 }
 
 //---------------------------------------------------------------------------
-void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY,
+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;
 		float scalarComponent;
@@ -118,11 +130,15 @@ void BrushFilter::Run() // virtual
 
 		for (i = minX; i <= maxX; i++) 
 		{
-			xx = _px - 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;
+//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++) 
 				{
@@ -138,7 +154,9 @@ void BrushFilter::Run() // virtual
 						} // _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) {
 								pixelModify=true;