#3562 Active option in GaussianSmooth ImageThreshold box

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageGaussianSmooth2.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkImageGaussianSmooth2.cxx
index 4998bf90b5a673b7d1484c7b78142754aaf23720..8608c61aa7a6c0db741e858d6fe9a48af1d934a2 100644 (file)
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageGaussianSmooth2.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageGaussianSmooth2.cxx
@@ -28,7 +28,7 @@ void ImageGaussianSmooth2::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
     
-    if (bbGetInputIn()!=NULL)
+    if ((bbGetInputActive()==true) && (bbGetInputIn()!=NULL) )
     {
         if (gaussiansmooth!=NULL)
         {
@@ -44,49 +44,45 @@ void ImageGaussianSmooth2::Process()
     } else {
         bbSetOutputOut(NULL);
     }
-    
 }
-//===== 
+
+//=====
 // 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)
 //===== 
 void ImageGaussianSmooth2::bbUserSetDefaultValues()
 {
-
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
     gaussiansmooth=NULL;
+    bbSetInputActive(true);
     bbSetInputIn(NULL);
     bbSetInputStdDevX(2);
     bbSetInputStdDevY(2);
     bbSetInputStdDevZ(2);
-
 }
-//===== 
+
+//=====
 // 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)
 //===== 
 void ImageGaussianSmooth2::bbUserInitializeProcessing()
 {
-
 //  THE INITIALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should allocate the internal/output pointers 
-//    if any 
-
-  
+//    if any
 }
-//===== 
+
+//=====
 // 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)
 //===== 
 void ImageGaussianSmooth2::bbUserFinalizeProcessing()
 {
-
 //  THE FINALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should desallocate the internal/output pointers 
 //    if any
-  
-}
 }
-// EO namespace bbcreaVtk
+
+}// EO namespace bbcreaVtk
 
 

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageGaussianSmooth2.h b/bbtk_creaVtk_PKG/src/bbcreaVtkImageGaussianSmooth2.h
index 39503dfc4c9c8d665cd57b4ef66715137f73d510..c3f9a5f04705868ffeddbc2f569c86aaa26482b3 100644 (file)
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageGaussianSmooth2.h
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageGaussianSmooth2.h
@@ -22,6 +22,7 @@ class bbcreaVtk_EXPORT ImageGaussianSmooth2
 //===== 
 // 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)
 //===== 
+    BBTK_DECLARE_INPUT(Active,bool);
     BBTK_DECLARE_INPUT(In,vtkImageData*);
     BBTK_DECLARE_INPUT(StdDevX,double);
     BBTK_DECLARE_INPUT(StdDevY,double);
@@ -42,6 +43,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageGaussianSmooth2,bbtk::AtomicBlackBox);
     BBTK_DESCRIPTION("No Description.");
     BBTK_CATEGORY("empty");
 
+    BBTK_INPUT(ImageGaussianSmooth2,Active,"(default true) true/false",bool,"");
     BBTK_INPUT(ImageGaussianSmooth2,In,"First input",vtkImageData*,"");
     BBTK_INPUT(ImageGaussianSmooth2,StdDevX,"(default 2) Standard deviation in direction X",double,"");
     BBTK_INPUT(ImageGaussianSmooth2,StdDevY,"(default 2) Standard deviation in direction Y",double,"");

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageThreshold.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkImageThreshold.cxx
index a6c35f643c8f2a8c1614283d934f5173b8d5319f..47fd553f7c85eee45ee977ab1d5c2eecc4ef54e8 100644 (file)
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageThreshold.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageThreshold.cxx
@@ -28,15 +28,14 @@ void ImageThreshold::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
   
-       if (filter!=NULL)
-       {       
-               filter->Delete();
-               filter=NULL;
-       } // if
-       filter = vtkImageThreshold::New();
-
-       if (bbGetInputIn()!=NULL)
+       if ((bbGetInputActive()==true) && (bbGetInputIn()!=NULL) )
        {
+        if (filter!=NULL)
+        {
+            filter->Delete();
+            filter=NULL;
+        } // if
+        filter = vtkImageThreshold::New();
                filter->SetInValue( bbGetInputInValue() );
                filter->SetOutValue( bbGetInputOutValue() );
                filter->SetInputData( bbGetInputIn() );
@@ -56,6 +55,7 @@ void ImageThreshold::bbUserSetDefaultValues()
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
        filter=NULL;
+    bbSetInputActive(true);
        bbSetInputIn(NULL);
        bbSetInputLower(0);
        bbSetInputUpper(10000);

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkImageThreshold.h b/bbtk_creaVtk_PKG/src/bbcreaVtkImageThreshold.h
index 7a5f2f2ff034e74635064c4aa19f5686e7b028bb..05cda295206f074debd3a6b6f1240ac86b4743bb 100644 (file)
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkImageThreshold.h
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkImageThreshold.h
@@ -22,6 +22,7 @@ class bbcreaVtk_EXPORT ImageThreshold
 //===== 
 // 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)
 //===== 
+  BBTK_DECLARE_INPUT(Active,bool);
   BBTK_DECLARE_INPUT(In,vtkImageData*);
   BBTK_DECLARE_INPUT(Lower,double);
   BBTK_DECLARE_INPUT(Upper,double);
@@ -31,7 +32,7 @@ class bbcreaVtk_EXPORT ImageThreshold
   BBTK_PROCESS(Process);
   void Process();
 
-       vtkImageThreshold *filter;
+  vtkImageThreshold *filter;
 
 //===== 
 // 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)
@@ -43,6 +44,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageThreshold,bbtk::AtomicBlackBox);
   BBTK_AUTHOR("InfoDev");
   BBTK_DESCRIPTION("No Description.");
   BBTK_CATEGORY("empty");
+BBTK_INPUT(ImageThreshold,Active,"(default true)  true/false",bool,"");
   BBTK_INPUT(ImageThreshold,In,"Input image",vtkImageData*,"");
   BBTK_INPUT(ImageThreshold,Lower,"(default 0) Lower threshold",double,"");
   BBTK_INPUT(ImageThreshold,Upper,"(default 10000) Upper threshold",double,"");

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkPolyDataToImageData.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkPolyDataToImageData.cxx
index bed2479046a0c0657f3aba14bf7fab0b63e2942d..58f529249361ea6f0c500358a2204683ca24798e 100644 (file)
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkPolyDataToImageData.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkPolyDataToImageData.cxx
@@ -80,7 +80,8 @@ printf("EED Warnning!! PolyDataToImageData::Process    Clean this code .........
                bbSetOutputOut( NULL);
        }// if In NULL
 }
-//===== 
+
+//=====
 // 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)
 //===== 
 void PolyDataToImageData::bbUserSetDefaultValues()
@@ -91,7 +92,8 @@ void PolyDataToImageData::bbUserSetDefaultValues()
        bbSetInputInImage(NULL);
        bbSetInputBackgroundValue(255);
 }
-//===== 
+
+//=====
 // 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)
 //===== 
 void PolyDataToImageData::bbUserInitializeProcessing()
@@ -105,19 +107,18 @@ void PolyDataToImageData::bbUserInitializeProcessing()
        extract                 = NULL;
        stencil                 = NULL;
 }
-//===== 
+
+//=====
 // 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)
 //===== 
 void PolyDataToImageData::bbUserFinalizeProcessing()
 {
-
 //  THE FINALIZATION METHOD BODY :
 //    Here does nothing 
 //    but this is where you should desallocate the internal/output pointers 
 //    if any
-  
 }
-}
-// EO namespace bbcreaVtk
+
+}// EO namespace bbcreaVtk
 
 

diff --git a/lib/creaVtk/CMakeLists.txt b/lib/creaVtk/CMakeLists.txt
index 93560c511892dba7b9196eab29e1db0bc56500ed..4e4647b2966c51c499d9d172d3ddcdb4506ea98f 100644 (file)
--- a/lib/creaVtk/CMakeLists.txt
+++ b/lib/creaVtk/CMakeLists.txt
@@ -76,6 +76,9 @@ IF ( BUILD_${LIBRARY_NAME} )
   # e.g.
   # ../mySampleLib
    
+   
+/Users/davila/Borrame/borrame/nn/teemInstall/include   
+   
   )
 
   #----------------------------------------------------------------------------