X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkBinaryThresholdImageFilter.h;h=eb26cab1f340a7aaf62e3b45984748f45aa43373;hb=1e2df7fb6ae571ce1cf72e6af1715f0e34675cbf;hp=0ea322d32cf1b78333c1d8592d0a708714b41f80;hpb=f5db17702a2c51a5933f6c556d070167e4db9cfd;p=bbtk.git

diff --git a/packages/itk/src/bbitkBinaryThresholdImageFilter.h b/packages/itk/src/bbitkBinaryThresholdImageFilter.h
index 0ea322d..eb26cab 100644
--- a/packages/itk/src/bbitkBinaryThresholdImageFilter.h
+++ b/packages/itk/src/bbitkBinaryThresholdImageFilter.h
@@ -1,7 +1,39 @@
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbitkBinaryThresholdImageFilter.h,v $
+  Language:  C++
+  Date:      $Date: 2008/11/25 11:17:15 $
+  Version:   $Revision: 1.10 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 #ifdef _USE_ITK_
 
 #include "bbtkAtomicBlackBox.h"
 #include "itkBinaryThresholdImageFilter.h"
+#include "bbtkItkBlackBoxMacros.h"
 #include "bbitkImage.h"
 
 namespace bbitk
@@ -13,25 +45,26 @@ namespace bbitk
     public bbtk::AtomicBlackBox,
     public itk::BinaryThresholdImageFilter<T,T>
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(BinaryThresholdImageFilter,
-				  bbtk::AtomicBlackBox);
+    BBTK_TEMPLATE_BLACK_BOX_INTERFACE(BinaryThresholdImageFilter,
+				      bbtk::AtomicBlackBox,T);
     typedef itk::BinaryThresholdImageFilter<T,T> itkParent;
-    BBTK_DECLARE_ITK_INPUT(itkParent,In,const T*);
-    BBTK_DECLARE_ITK_PARAM(itkParent,LowerThreshold,typename T::PixelType);
-    BBTK_DECLARE_ITK_PARAM(itkParent,UpperThreshold,typename T::PixelType);
-    BBTK_DECLARE_ITK_PARAM(itkParent,InsideValue,typename T::PixelType);
-    BBTK_DECLARE_ITK_PARAM(itkParent,OutsideValue,typename T::PixelType);
-    BBTK_DECLARE_ITK_OUTPUT(itkParent,Out,T*);
-    BBTK_PROCESS(itkParent::Update);
-    void bbDelete() { itkParent::UnRegister(); }
+    BBTK_DECLARE_ITK_INPUT(In,const T*);
+    BBTK_DECLARE_ITK_PARAM(LowerThreshold,typename T::PixelType);
+    BBTK_DECLARE_ITK_PARAM(UpperThreshold,typename T::PixelType);
+    BBTK_DECLARE_ITK_PARAM(InsideValue,typename T::PixelType);
+    BBTK_DECLARE_ITK_PARAM(OutsideValue,typename T::PixelType);
+    BBTK_DECLARE_ITK_OUTPUT(Out,T*);
+    BBTK_ITK_PROCESS();
+    BBTK_ITK_DELETE();
 
     void bbUserConstructor() { Init(); }
-    void bbUserCopyConstructor() { Init(); }
+    void bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); }
     void Init();
 
   };
   
-  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(BinaryThresholdImageFilter);
+  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(BinaryThresholdImageFilter,
+				      bbtk::AtomicBlackBox);
   BBTK_NAME("BinaryThresholdImageFilter<"+bbtk::TypeName<T>()+">");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Binarizes an image by thresholding (bbification of itk::BinaryThresholdImageFilter)");
@@ -56,7 +89,7 @@ namespace bbitk
     : 
     public bbtk::AtomicBlackBox
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(BinaryThresholdImageFilterGeneric,
+    BBTK_BLACK_BOX_INTERFACE(BinaryThresholdImageFilterGeneric,
 				  bbtk::AtomicBlackBox);
     BBTK_DECLARE_INPUT(In,anyImagePointer);
     BBTK_DECLARE_INPUT(LowerThreshold,double);
@@ -69,7 +102,7 @@ namespace bbitk
     inline void ProcessSwitch();
     template <class T> void Process();
     void bbUserConstructor() { Init(); }
-    void bbUserCopyConstructor() { Init(); }
+    void bbUserCopyConstructor(bbtk::BlackBox::Pointer) { Init(); }
     void Init();
   };
   
@@ -80,18 +113,18 @@ namespace bbitk
   BBTK_CATEGORY("filter;image");
   BBTK_DESCRIPTION("Binarizes an image by thresholding (generic bbification of itk::BinaryThresholdImageFilter)");
   BBTK_INPUT(BinaryThresholdImageFilterGeneric,In,
-	     "Input image. Can be any itk::Image<T,D>*",anyImagePointer);
+	     "Input image. Can be any itk::Image<T,D>*",anyImagePointer,"");
   BBTK_INPUT(BinaryThresholdImageFilterGeneric,LowerThreshold,
-	     "Lower threshold",double);
+	     "Lower threshold",double,"");
   BBTK_INPUT(BinaryThresholdImageFilterGeneric,UpperThreshold,
-	     "Upper threshold",double);
+	     "Upper threshold",double,"");
   BBTK_INPUT(BinaryThresholdImageFilterGeneric,InsideValue,
-	     "Output value for pixels inside thresholds",double);
+	     "Output value for pixels inside thresholds",double,"");
   BBTK_INPUT(BinaryThresholdImageFilterGeneric,OutsideValue,
-	     "Output value for pixels outside thresholds",double);
+	     "Output value for pixels outside thresholds",double,"");
   BBTK_OUTPUT(BinaryThresholdImageFilterGeneric,Out,
 	      "Output image. Of the same type and dimension than the input image",
-	      anyImagePointer);
+	      anyImagePointer,"");
   BBTK_END_DESCRIBE_BLACK_BOX(BinaryThresholdImageFilterGeneric);
 
 
@@ -109,8 +142,9 @@ namespace bbitk
 			<<bbtk::TypeName<T>()<<">()"<<std::endl);
  
     typedef BinaryThresholdImageFilter<T> FilterType;
-    FilterType* f = FilterType::bbNew("Temp");
-    f->bbSetInputIn( this->bbGetInputIn().get<T*>());
+    typename FilterType::Pointer f = FilterType::New("Temp");
+	  typedef T* TPointer; 
+	  f->bbSetInputIn( this->bbGetInputIn().get < TPointer > ());
     f->bbSetInputLowerThreshold ( (typename T::PixelType)
 				  this->bbGetInputLowerThreshold() );
     f->bbSetInputUpperThreshold ( (typename T::PixelType)
@@ -122,7 +156,7 @@ namespace bbitk
     f->bbExecute();
     f->bbGetOutputOut()->Register();
     this->bbSetOutputOut( f->bbGetOutputOut() );
-    f->bbDelete();
+
     bbtkDebugDecTab("Core",9);
   }