From: Eduardo DAVILA <davila@localhost.localdomain>
Date: Sat, 12 Aug 2017 08:20:05 +0000 (+0200)
Subject: #3110 creaVtk Bug New Normal  -  branch vtk7itk4 compilation with vtk7
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bb3deaadd0e16754048cd5be52497e86c0a61ed9;hp=5da2d7a053e24ef3b8e0fbd1dab04adda5d1625b;p=creaVtk.git

#3110 creaVtk Bug New Normal  -  branch vtk7itk4 compilation with vtk7
---

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.cxx
index 5ed81c7..f7ab426 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.cxx
@@ -30,16 +30,17 @@ vtkImageData* ImageContinuousDilate3D::dilateFilterRecursive(vtkImageData* image
 		{
 			resultRec = dilateFilter->GetOutput();
 			return resultRec;
-		}
-		else {
-			vtkImageData* resultRec = dilateFilterRecursive(dilateFilter->GetOutput(), (repetitions-1), x, y, z);
-		}
+		}else{
+			dilateFilterRecursive(dilateFilter->GetOutput(), (repetitions-1), x, y, z);
+		}// if repetitions
 }
 
 void ImageContinuousDilate3D::bbUserSetDefaultValues()
 {
-
-
+ 	bbSetInputX(3); 
+ 	bbSetInputY(3); 
+ 	bbSetInputY(3); 
+ 	bbSetInputRepetitions(0); 
 }
 
 void ImageContinuousDilate3D::bbUserInitializeProcessing()
diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.h b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.h
index c6e2a8b..738e9f3 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.h
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousDilate3D.h
@@ -40,10 +40,10 @@ BBTK_NAME("ImageContinuousDilate3D");
 BBTK_AUTHOR("Carlos Torres");
 BBTK_DESCRIPTION("No Description.");
 BBTK_CATEGORY("empty");
-BBTK_INPUT(ImageContinuousDilate3D,X,"X",double,"");
-BBTK_INPUT(ImageContinuousDilate3D,Y,"Y",double,"");
-BBTK_INPUT(ImageContinuousDilate3D,Z,"Z",double,"");
-BBTK_INPUT(ImageContinuousDilate3D,Repetitions,"Repetitions",int,"");
+BBTK_INPUT(ImageContinuousDilate3D,X,"X (default 3)",double,"");
+BBTK_INPUT(ImageContinuousDilate3D,Y,"Y (default 3)",double,"");
+BBTK_INPUT(ImageContinuousDilate3D,Z,"Z (default 3)",double,"");
+BBTK_INPUT(ImageContinuousDilate3D,Repetitions,"Repetitions (default 0, it works minimum ones) ",int,"");
 BBTK_INPUT(ImageContinuousDilate3D,Image,"Image input",vtkImageData*,"");
 BBTK_OUTPUT(ImageContinuousDilate3D,Out,"Image output",vtkImageData*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ImageContinuousDilate3D);
diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
index ac41246..4784991 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.cxx
@@ -30,10 +30,9 @@ vtkImageData* ImageContinuousErode3D::erodeFilterRecursive(vtkImageData* image,
 		{
 			resultRec = erodeFilter->GetOutput();
 			return resultRec;
-		}
-		else {
-			vtkImageData* resultRec = erodeFilterRecursive(erodeFilter->GetOutput(), (repetitions-1), x, y, z);
-		}
+		}else{
+			erodeFilterRecursive(erodeFilter->GetOutput(), (repetitions-1), x, y, z);
+		} // if repetitions
 }
 
 void ImageContinuousErode3D::bbUserSetDefaultValues()
@@ -45,7 +44,10 @@ void ImageContinuousErode3D::bbUserSetDefaultValues()
 //===== 
 void ImageContinuousErode3D::bbUserInitializeProcessing()
 {
-  
+ 	bbSetInputX(3); 
+ 	bbSetInputY(3); 
+ 	bbSetInputY(3); 
+ 	bbSetInputRepetitions(0); 
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.h b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.h
index ed6810a..efe2127 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.h
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageContinuousErode3D.h
@@ -39,10 +39,10 @@ BBTK_NAME("ImageContinuousErode3D");
 BBTK_AUTHOR("Carlos Torres");
 BBTK_DESCRIPTION("No Description.");
 BBTK_CATEGORY("empty");
-BBTK_INPUT(ImageContinuousErode3D,X,"X",double,"");
-BBTK_INPUT(ImageContinuousErode3D,Y,"Y",double,"");
-BBTK_INPUT(ImageContinuousErode3D,Z,"Z",double,"");
-BBTK_INPUT(ImageContinuousErode3D,Repetitions,"Repetitions",int,"");
+BBTK_INPUT(ImageContinuousErode3D,X,"X (default 3)",double,"");
+BBTK_INPUT(ImageContinuousErode3D,Y,"Y (default 3)",double,"");
+BBTK_INPUT(ImageContinuousErode3D,Z,"Z (default 3)",double,"");
+BBTK_INPUT(ImageContinuousErode3D,Repetitions,"Repetitions  (default 0, it works minimum ones)",int,"");
 BBTK_INPUT(ImageContinuousErode3D,Image,"Image input",vtkImageData*,"");
 BBTK_OUTPUT(ImageContinuousErode3D,Out,"Image output",vtkImageData*,"");
 BBTK_END_DESCRIBE_BLACK_BOX(ImageContinuousErode3D);