X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.cpp;h=1e2c470fee85473a3fc10f8a6c307dee1e517e8c;hb=e263b7ace0f53d647a731553a3f67700838ad146;hp=e2ea0232c6d32dee6a2ab282706ce8d8da9b5f2c;hpb=a906c7009b5c3c2ef5263f4d84ba13be7d4549ff;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
index e2ea023..1e2c470 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
@@ -76,7 +76,7 @@ void FillFilter::SetImages(vtkImageData *image,vtkImageData *image2) // virtual
 	}
 	_maxXback=_maxX;
 	_maxYback=_maxY;
-	_maxYback=_maxZ;	
+	_maxZback=_maxZ;	
 }
 
 
@@ -96,7 +96,15 @@ void FillFilter::Run() // virtual
 		_countRecursiveFillProblem 	= 0;
 		_countProgressingFill 		= 0;
 		_usingAuxImageFill 			= false;
+
 		ivi 						= _px + _py*(_maxX+1) + _pz*(_maxX+1)*(_maxY+1);  // index vector image
+
+
+DEF_POINTER_IMAGE_VTK_CREA_set(v_image,ss_image,p_image,st_image,_image)		
+DEF_POINTER_IMAGE_VTK_CREA_set(v_image2,ss_image2,p_image2,st_image2,_image2)		
+
+
+
 //EED01
 //		FillToolRecursive(_px, _py, _pz);
 		FillToolRecursive(_px, _py, _pz, ivi);
@@ -133,8 +141,8 @@ void FillFilter::Run() // virtual
 //---------------------------------------------------------------------------
 void FillFilter::FillToolRecursive(int px, int py, int pz,long int ivi) 
 {
-DEF_POINTER_IMAGE_VTK_CREA(v_image,ss_image,p_image,st_image,_image)		
-DEF_POINTER_IMAGE_VTK_CREA(v_image2,ss_image2,p_image2,st_image2,_image2)		
+//ups ??EED   DEF_POINTER_IMAGE_VTK_CREA(v_image,ss_image,p_image,st_image,_image)		
+//ups ??EED   DEF_POINTER_IMAGE_VTK_CREA(v_image2,ss_image2,p_image2,st_image2,_image2)		
 
 	_countRecursiveFill++;
 	_countProgressingFill++;
@@ -149,14 +157,18 @@ DEF_POINTER_IMAGE_VTK_CREA(v_image2,ss_image2,p_image2,st_image2,_image2)
 	{
 		if (_usingAuxImageFill == true) 
 		{
-			this->_IMManager->AddModifiedPixel(px, py, pz); //DFCH
+//UPS ??EED			this->_IMManager->AddModifiedPixel(px, py, pz); //DFCH
 //EED01
 //			_auxImageFill->SetScalarComponentFromFloat(px, py, pz, 0, 0);
 			_ptrAuxImageFill[ ivi ]=0;
 		}
-		_tmpDistfill = (px-_pxfill)*(px-_pxfill)
-					+  (py-_pyfill)*(py-_pyfill)
-					+  (pz-_pzfill)*(pz-_pzfill);
+		difX=px-_pxfill;
+		difY=py-_pyfill;
+		difZ=pz-_pzfill;
+		_tmpDistfill = difX*difX + difY*difY + difZ*difZ;
+//		_tmpDistfill = (px-_pxfill)*(px-_pxfill)
+//					+  (py-_pyfill)*(py-_pyfill)
+//					+  (pz-_pzfill)*(pz-_pzfill);
 
 //if (_countRecursiveFill >1 )
 //{
@@ -217,7 +229,7 @@ GETVALUE2_VTK_CREA(_tmpiglfill2,p_image2,st_image2,ivi)
 
 		if (_auxGrayLevelValidationFill == true) 
 		{
-			this->_IMManager->AddModifiedPixel(px, py, pz); //DFCH
+//UPS ??EED			this->_IMManager->AddModifiedPixel(px, py, pz); //DFCH
 			if (_image2!=NULL)
 			{
 //EED01