X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkExtractImageFilter.h;h=8906085d7dd744ee2ec207c5748f0d315db2e36a;hb=0e7db59ef7d65efd7477ab1f214f8a83c6ad3eb4;hp=b6de2d11513789a4cd5d1bd33b12fdd53b900cd5;hpb=6c5d7746e8e4cb0b5d6e164b917008a7137910fb;p=bbtk.git

diff --git a/packages/itk/src/bbitkExtractImageFilter.h b/packages/itk/src/bbitkExtractImageFilter.h
index b6de2d1..8906085 100644
--- a/packages/itk/src/bbitkExtractImageFilter.h
+++ b/packages/itk/src/bbitkExtractImageFilter.h
@@ -1,7 +1,39 @@
+/*=========================================================================                                                                               
+  Program:   bbtk
+  Module:    $RCSfile: bbitkExtractImageFilter.h,v $
+  Language:  C++
+  Date:      $Date: 2008/11/12 12:47:03 $
+  Version:   $Revision: 1.9 $
+=========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* 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 "itkExtractImageFilter.h"
+#include "bbtkItkBlackBoxMacros.h"
 #include "bbitkImage.h"
 #include "bbitkImageRegion.h"
 
@@ -15,19 +47,22 @@ namespace bbitk
     public bbtk::AtomicBlackBox,
     public itk::ExtractImageFilter<T,T>
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(ExtractImageFilter,bbtk::AtomicBlackBox);
+    BBTK_TEMPLATE_BLACK_BOX_INTERFACE(ExtractImageFilter,
+				      bbtk::AtomicBlackBox,
+				      T);
     typedef itk::ExtractImageFilter<T,T> itkParent;
 
-    BBTK_DECLARE_ITK_INPUT(itkParent,In,const T*);
-    BBTK_DECLARE_ITK_PARAM(itkParent,ExtractionRegion,typename T::RegionType);
-    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(ExtractionRegion,typename T::RegionType);
+    BBTK_DECLARE_ITK_OUTPUT(Out,T*);
+
+    BBTK_ITK_PROCESS();
+    BBTK_ITK_DELETE();
   };
 
 
-  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(ExtractImageFilter);
+  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(ExtractImageFilter,
+				      bbtk::AtomicBlackBox);
   BBTK_NAME("ExtractImageFilter<"+bbtk::TypeName<T>()+">");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Decrease the image size by cropping the image to the selected region bounds (bbification of itk::ExtractImageFilter)");
@@ -42,8 +77,8 @@ namespace bbitk
   class /*BBTK_EXPORT*/ ExtractImageFilterGeneric
     : public bbtk::AtomicBlackBox
   {
-    BBTK_USER_BLACK_BOX_INTERFACE(ExtractImageFilterGeneric,
-				  bbtk::AtomicBlackBox);
+    BBTK_BLACK_BOX_INTERFACE(ExtractImageFilterGeneric,
+			     bbtk::AtomicBlackBox);
     BBTK_DECLARE_INPUT(In,anyImagePointer);
     BBTK_DECLARE_INPUT(Region,anyImageRegion);
     BBTK_DECLARE_OUTPUT(Out,anyImagePointer);
@@ -76,13 +111,14 @@ namespace bbitk
 			<<bbtk::TypeName<T>()<<">()"<<std::endl);
     typedef T ImageType;
     typedef ExtractImageFilter<ImageType> FilterType;
-    FilterType* f = FilterType::bbNew("Temp");
-    f->bbSetInputIn( this->bbGetInputIn().unsafe_get<T*>() );
+    typename FilterType::Pointer f = FilterType::New("Temp");
+	  typedef ImageType* ImageTypePointer; 
+    f->bbSetInputIn( this->bbGetInputIn().unsafe_get<ImageTypePointer>() );
     f->bbSetInputExtractionRegion ( this->bbGetInputRegion().get<typename T::RegionType>() );
     f->bbExecute();
     f->bbGetOutputOut()->Register();
     this->bbSetOutputOut( f->bbGetOutputOut() );
-    f->bbDelete();
+    //  f->bbDelete();
 
     bbtkDebugDecTab("Core",9);
   }