#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 5ed81c769bba5d88a86835d5f54ffada7a8c751d..f7ab4265629b9284018e1a5bd9c2d084385962df 100644 (file)
--- 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 c6e2a8b5d0aee2341f426ce5ff9086c7db5557dc..738e9f3748f54353c51c52e1b89eceac7a29c2d1 100644 (file)
--- 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 ac412460724c5299e3f732806e89afe7342f03d8..4784991cf9ed9f611ffcd211d7289875e704b66f 100644 (file)
--- 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 ed6810acbdd5635380c2264357473f721229aa0f..efe2127ecd4085413930da29b9a2662f390d1e41 100644 (file)
--- 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);