X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FBrushFilter.cpp;h=0f359e6c9f3e0f16a61bedb5566929d51fbf95f2;hb=f9901e756bb82bd333310b47607875331616bb29;hp=f792652e95f4e34fa9cd218277ab2811ea6fbec6;hpb=f6b647d5bd4c238c85deb7a07950ebe8f296d49d;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 f792652..0f359e6 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
 }
@@ -38,7 +39,8 @@ BrushFilter::~BrushFilter() // virtual
 
 //---------------------------------------------------------------------------
 void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY,
-		int &minZ, int &maxZ, int &size) {
+		int &minZ, int &maxZ, int &size) 
+{
 	size = _brushsize - 1;
 	minX = _px - size;
 	maxX = _px + size;
@@ -48,51 +50,33 @@ void BrushFilter::FindMinMaxBrush(int &minX, int &maxX, int &minY, int &maxY,
 	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
-			{
-	}
+	} // _2D3D
 
-	if (minX < _minX) {
-		minX = _minX;
-	}
+	if (_2D3D == 1) {  }  // 3D 
 
-	if (minY < _minY) {
-		minY = _minY;
-	}
+	if (minX < _minX) { minX = _minX; }
+	if (minY < _minY) { minY = _minY; }
+	if (minZ < _minZ) { minZ = _minZ; }
 
-	if (minZ < _minZ) {
-		minZ = _minZ;
-	}
-
-	if (maxX > _maxX) {
-		maxX = _maxX;
-	}
-
-	if (maxY > _maxY) {
-		maxY = _maxY;
-	}
-
-	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);
@@ -103,6 +87,8 @@ void BrushFilter::Run() // virtual
 {
 	if (_image != NULL)
 	{
+		this->_IMManager->BaseInitialPoint(_px, _py ,_pz);
+
 		float value = (float) _graylevel;
 		int i, j, k;