X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=common%2FclitkCommonGenericFilter.h;h=55d2f94019f3fd83cead0fefe9e97469841d582a;hb=0b7c9b1e1215634b02cbd38d4e4ba101d6111ba8;hp=751a7262a63b1a97122658ccb93eba3c441e8de1;hpb=8186ce7844751ffa0bd43e8a6ed53d1cc050b843;p=clitk.git

diff --git a/common/clitkCommonGenericFilter.h b/common/clitkCommonGenericFilter.h
index 751a726..55d2f94 100644
--- a/common/clitkCommonGenericFilter.h
+++ b/common/clitkCommonGenericFilter.h
@@ -1,35 +1,22 @@
 /*=========================================================================
+  Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
-  Program:   clitk
-  Module:    $RCSfile: clitkCommonGenericFilter.h,v $
-  Language:  C++
-  Date:      $Date: 2010/01/29 08:48:42 $
-  Version:   $Revision: 1.1 $
-  Author :   Joel Schaerer <joel.schaerer@creatis.insa-lyon.fr>
-             David Sarrut <david.sarrut@creatis.insa-lyon.fr>
+  Authors belong to: 
+  - University of LYON              http://www.universite-lyon.fr/
+  - Léon Bérard cancer center       http://oncora1.lyon.fnclcc.fr
+  - CREATIS CNRS laboratory         http://www.creatis.insa-lyon.fr
 
-  Copyright (C) 2008
-  Léon Bérard cancer center http://oncora1.lyon.fnclcc.fr
-  CREATIS-LRMN http://www.creatis.insa-lyon.fr
+  This software is distributed WITHOUT ANY WARRANTY; without even
+  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE.  See the copyright notices for more information.
 
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, version 3 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-  =========================================================================*/
+  It is distributed under dual licence
 
+  - BSD        See included LICENSE.txt file
+  - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+======================================================================-====*/
 #ifndef CLITKCOMMONGENERICFILTER_H
 #define CLITKCOMMONGENERICFILTER_H
-
-// clitk include
 #include "clitkCommon.h"
 
 /*--------------------------------------------------------------------
@@ -45,18 +32,16 @@ namespace clitk {
   class GenericFilterFunctorBase {
   public:
     GenericFilterFunctorBase(FilterType * f) { mFilter = f; }
-    virtual void DoIt()= 0;
+    virtual void Execute()= 0;
     FilterType * mFilter;
   };
  
   //--------------------------------------------------------------------
-  template<class FilterType, unsigned int Dim, class PixelType>
+  template<class FilterType, class InputImageType>
   class GenericFilterFunctorWithDimAndPixelType: public GenericFilterFunctorBase<FilterType> {
   public:
     GenericFilterFunctorWithDimAndPixelType(FilterType * f): GenericFilterFunctorBase<FilterType>(f) {}
-    virtual void DoIt() {       
-      //GenericFilterFunctorBase<FilterType>::mFilter->template UpdateWithDimAndPixelType<Dim,PixelType>();
-      typedef itk::Image<PixelType,Dim> InputImageType;
+    virtual void Execute() {       
       GenericFilterFunctorBase<FilterType>::mFilter->template UpdateWithInputImageType<InputImageType>();
     }
   };
@@ -66,20 +51,28 @@ namespace clitk {
   class ImageTypesManager  {
   public:
     typedef std::map<std::string, GenericFilterFunctorBase<FilterType>*> MapOfPixelTypeToFunctionType;
-    std::map<int, MapOfPixelTypeToFunctionType> mMapOfImageTypeToFunction;
+    typedef std::map<unsigned int, MapOfPixelTypeToFunctionType> MapOfImageComponentsToFunctionType;
+    typedef std::map<unsigned int, MapOfImageComponentsToFunctionType> MapOfImageDimensionToFunctionType;
+    MapOfImageDimensionToFunctionType mMapOfImageTypeToFunction;
 
     ImageTypesManager(FilterType * f) { mFilter = f;  }
-    virtual void DoIt(int dim, std::string pixelname) {
+    virtual void DoIt(int dim, int ncomp, std::string pixelname) {
       // std::cout << "ImageTypesManager DoIt " << dim << " " << pixelname << std::endl;
-      if (mMapOfImageTypeToFunction[dim][pixelname])
-        mMapOfImageTypeToFunction[dim][pixelname]->DoIt();
+      if (mMapOfImageTypeToFunction[dim][ncomp][pixelname])
+        mMapOfImageTypeToFunction[dim][ncomp][pixelname]->Execute();
+    }
+    template<unsigned int Dim, unsigned int NComp, class PixelType>
+    void AddNewDimensionAndPixelType() {
+        typedef itk::Image<itk::Vector<PixelType,NComp>,Dim> InputImageType;
+        mMapOfImageTypeToFunction[Dim][NComp][ GetTypeAsString<PixelType>() ] = 
+            new GenericFilterFunctorWithDimAndPixelType<FilterType, InputImageType>(mFilter);
     }
-    template<unsigned int Dim, class Pixeltype>
+    /// Specialization for NComp == 1
+    template<unsigned int Dim, class PixelType>
     void AddNewDimensionAndPixelType() {
-      // std::cout << "Adding Dim=" << Dim << " and PT = " << GetTypeAsString<Pixeltype>() << std::endl;
-      mFilter->AddImageType(Dim, GetTypeAsString<Pixeltype>());
-      mMapOfImageTypeToFunction[Dim][ GetTypeAsString<Pixeltype>() ] = 
-        new GenericFilterFunctorWithDimAndPixelType<FilterType, Dim, Pixeltype>(mFilter);
+        typedef itk::Image<PixelType,Dim> InputImageType;
+        mMapOfImageTypeToFunction[Dim][1][ GetTypeAsString<PixelType>() ] = 
+            new GenericFilterFunctorWithDimAndPixelType<FilterType, InputImageType>(mFilter);
     }
     FilterType * mFilter;
   };