X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.cpp;fp=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualPaint%2FFillFilter.cpp;h=8210bec46e5199ab49af3d6662136d626e43d62c;hb=228dd2fe51b414e56427b93a1d99a35e568c7033;hp=3f9c7ad0fb9ad34e7e8cc6537c75d52c2e529e73;hpb=b57f054e2ccec0a3f36c3fbff8250860dc7d9c3f;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 3f9c7ad..8210bec 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualPaint/FillFilter.cpp
@@ -24,6 +24,7 @@
 # ------------------------------------------------------------------------ */
 
 #include "FillFilter.h"
+#include "creaVtk_MACROS.h"
 
 FillFilter::FillFilter() 
 {
@@ -125,8 +126,8 @@ void FillFilter::Run() // virtual
 //---------------------------------------------------------------------------
 void FillFilter::FillToolRecursive(int px, int py, int pz,long int ivi) 
 {
-DEFINEPOINTERIMAGE_MANUALPAINT(v_image,ss_image,p_image,st_image,_image)		
-DEFINEPOINTERIMAGE_MANUALPAINT(v_image2,ss_image2,p_image2,st_image2,_image2)		
+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)		
 
 	_countRecursiveFill++;
 	_countProgressingFill++;
@@ -158,13 +159,13 @@ DEFINEPOINTERIMAGE_MANUALPAINT(v_image2,ss_image2,p_image2,st_image2,_image2)
 
 //EED01 
 //		_tmpiglfill 	= _image->GetScalarComponentAsDouble(px, py, pz, 0);
-GETVALUE2_MANUALPAINT(_tmpiglfill,p_image,st_image,ivi) 	
+GETVALUE2_VTK_CREA(_tmpiglfill,p_image,st_image,ivi) 	
 
 		if (_image2!=NULL)
 		{
 //EED01
 //			_tmpiglfill2 	= 	_image2->GetScalarComponentAsDouble(px, py, pz, 0);
-GETVALUE2_MANUALPAINT(_tmpiglfill2,p_image2,st_image2,ivi) 	
+GETVALUE2_VTK_CREA(_tmpiglfill2,p_image2,st_image2,ivi) 	
 		} else {
 			_tmpiglfill2	=	_tmpiglfill;
 		}
@@ -214,11 +215,11 @@ GETVALUE2_MANUALPAINT(_tmpiglfill2,p_image2,st_image2,ivi)
 			{
 //EED01
 //				_image2->SetScalarComponentFromFloat(px, py, pz, 0,(float) _graylevel);
-SETVALUE2_MANUALPAINT(_graylevel,p_image2,st_image2,ivi)
+SETVALUE2_VTK_CREA(_graylevel,p_image2,st_image2,ivi)
 			} else {
 //EED01
 //				_image->SetScalarComponentFromFloat(px, py, pz, 0,(float) _graylevel);
-SETVALUE2_MANUALPAINT(_graylevel,p_image,st_image,ivi)
+SETVALUE2_VTK_CREA(_graylevel,p_image,st_image,ivi)
 			}
 
 			if (_countRecursiveFill < _limitRecursionFill)